From 51d9fc3f760039cb67d9b16577094318838fd333 Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Tue, 16 Jul 2024 23:18:01 +0800 Subject: [PATCH] Update Kubernetes v1.30.0 [sync git] Signed-off-by: Kang Huaishuai --- .env.example | 1 + CHANGELOG.md | 3 +++ dockerfile/php/nightly/cli/Dockerfile | 1 - dockerfile/php/nightly/fpm/Dockerfile | 1 - docs/windows/ssh.md | 5 +++++ kubernetes/.env.example | 2 +- kubernetes/.github/workflows/setup-k8s.yaml | 22 +++++++++---------- kubernetes/bin/lwpm.ps1 | 4 ++-- kubernetes/cfssl/Dockerfile | 2 +- kubernetes/docker-compose.bump.yml | 2 +- kubernetes/kubernetes-release/Dockerfile | 2 +- .../kubernetes-release/Dockerfile.buildx | 2 +- .../kubernetes-release/release/stable.txt | 2 +- kubernetes/rpi/README.md | 2 +- kubernetes/wsl2/00-README.NODE.md | 4 ++-- kubernetes/wsl2/00-README.SERVER.md | 4 ++-- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/crictl/lwpm.yml | 2 +- .../k8s/kubectl/lwpm.json | 2 +- .../lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml | 2 +- .../k8s/kubernetes-node/lwpm.json | 2 +- .../k8s/kubernetes-node/lwpm.yml | 2 +- .../k8s/kubernetes-server/lwpm.json | 2 +- .../k8s/kubernetes-server/lwpm.yml | 2 +- 24 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.env.example b/.env.example index 245f26001..030756bce 100644 --- a/.env.example +++ b/.env.example @@ -192,6 +192,7 @@ LNMP_LIBRARY_NS=library # LNMP_LIBRARY_NS=library-mirror # LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror # LNMP_LIBRARY_NS=pcit-docker.pkg.coding.net/khs1994-docker/library +# LNMP_LIBRARY_NS=hub.atomgit.com ## [PHP 项目文件路径（容器内路径）（绝对路径）] diff --git a/CHANGELOG.md b/CHANGELOG.md index b2cf0d39b..99fe13272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ ### Changes: +* Switch **PHP** to `8.3.0` +* Kuberentes `v1.30.0` + ### Updates: * [PHP `8.3.0` `8.2.13` `8.1.26`](https://www.php.net/ChangeLog-8.php#8.1.26) diff --git a/dockerfile/php/nightly/cli/Dockerfile b/dockerfile/php/nightly/cli/Dockerfile index 44acbc91f..12a2dc692 100644 --- a/dockerfile/php/nightly/cli/Dockerfile +++ b/dockerfile/php/nightly/cli/Dockerfile @@ -32,7 +32,6 @@ ENV PHPIZE_DEPS \ file \ g++ \ gcc \ - libc-dev \ make \ pkgconf \ re2c diff --git a/dockerfile/php/nightly/fpm/Dockerfile b/dockerfile/php/nightly/fpm/Dockerfile index 478a5829c..b77e659af 100644 --- a/dockerfile/php/nightly/fpm/Dockerfile +++ b/dockerfile/php/nightly/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ file \ g++ \ gcc \ - libc-dev \ make \ pkgconf \ re2c diff --git a/docs/windows/ssh.md b/docs/windows/ssh.md index bcceda378..bac82140f 100644 --- a/docs/windows/ssh.md +++ b/docs/windows/ssh.md @@ -18,6 +18,11 @@ Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0 ``` +## 离线安装 + +* https://learn.microsoft.com/zh-cn/windows-server/administration/openssh/openssh_server_configuration +* https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH + ## 启动 ```powershell diff --git a/kubernetes/.env.example b/kubernetes/.env.example index d4f5bba02..92cd6198c 100644 --- a/kubernetes/.env.example +++ b/kubernetes/.env.example @@ -1,4 +1,4 @@ -KUBERNETES_VERSION=1.29.0 +KUBERNETES_VERSION=1.30.0 # KUBERNETES_VERSION= diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml index 9f683f892..3a13d0b35 100644 --- a/kubernetes/.github/workflows/setup-k8s.yaml +++ b/kubernetes/.github/workflows/setup-k8s.yaml @@ -46,21 +46,21 @@ jobs: # next version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.30.0-alpha.2 + CI_KUBERNETES_VERSION: 1.31.0-alpha.3 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" # current stable version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio K8S_IMAGE_NS: khs1994 K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com UPLOAD_TO_CODING: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url GENERATE_CLI_HELP: "true" @@ -69,12 +69,12 @@ jobs: # ipv6 # - os: ubuntu # dist: 20.04 - # CI_KUBERNETES_VERSION: 1.29.0 + # CI_KUBERNETES_VERSION: 1.30.0 # LNMP_K8S_GET: --url # IPV6: "true" - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url CNI_CALICO_EBPF: 'true' # v1.24.0+ not support docker @@ -84,21 +84,21 @@ jobs: # LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.29.0 + CI_KUBERNETES_VERSION: 1.30.0 LNMP_K8S_GET: --url K8S_ROOT: /opt/k8s-custom # old version - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.28.6 + CI_KUBERNETES_VERSION: 1.29.6 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.27.10 + CI_KUBERNETES_VERSION: 1.28.11 LNMP_K8S_GET: --url - os: ubuntu dist: 20.04 - CI_KUBERNETES_VERSION: 1.26.13 + CI_KUBERNETES_VERSION: 1.27.15 LNMP_K8S_GET: --url fail-fast: false steps: @@ -516,7 +516,7 @@ jobs: export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH BASE_BRANCH=master # BASE_BRANCH=v1.25.0-config - if ! [ $CI_KUBERNETES_VERSION = '1.29.0' -a "$GENERATE_CLI_HELP" = "true" ];then + if ! [ $CI_KUBERNETES_VERSION = '1.30.0' -a "$GENERATE_CLI_HELP" = "true" ];then exit 0 fi @@ -545,7 +545,7 @@ jobs: BASE_BRANCH=v1.29.0-alpha.1-config BASE_BRANCH=master # BASE_BRANCH=v1.28.0-config - if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.2' ];then + if [ $CI_KUBERNETES_VERSION != '1.31.0-alpha.3' ];then exit 0 fi diff --git a/kubernetes/bin/lwpm.ps1 b/kubernetes/bin/lwpm.ps1 index 98e33db71..bf98a9790 100644 --- a/kubernetes/bin/lwpm.ps1 +++ b/kubernetes/bin/lwpm.ps1 @@ -1,9 +1,9 @@ $env:LWPM_DOCKER_REGISTRY="mirror.ccs.tencentyun.com" ./lnmp/windows/lnmp-windows-pm.ps1 add ` - kubernetes-node@1.29.0 ` + kubernetes-node@1.30.0 ` --all-platform $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR -./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.29.0 +./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.30.0 diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile index 9c959c817..ab0df0c9b 100644 --- a/kubernetes/cfssl/Dockerfile +++ b/kubernetes/cfssl/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=${TARGETPLATFORM} alpine:edge as tool -ENV KUBECTL_VERSION=v1.29.0 +ENV KUBECTL_VERSION=v1.30.0 ARG TARGETARCH diff --git a/kubernetes/docker-compose.bump.yml b/kubernetes/docker-compose.bump.yml index 02704c1bb..10f045d62 100644 --- a/kubernetes/docker-compose.bump.yml +++ b/kubernetes/docker-compose.bump.yml @@ -1,6 +1,6 @@ services: k8s_apiserver: - image: registry.k8s.io/kube-apiserver:v1.29.0 + image: registry.k8s.io/kube-apiserver:v1.30.0 etcd: image: quay.io/coreos/etcd:v3.5.8 diff --git a/kubernetes/kubernetes-release/Dockerfile b/kubernetes/kubernetes-release/Dockerfile index 149922712..c90ea3a88 100644 --- a/kubernetes/kubernetes-release/Dockerfile +++ b/kubernetes/kubernetes-release/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV KUBERNETES_VERSION=v1.29.0 +ENV KUBERNETES_VERSION=v1.30.0 # ENV KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/Dockerfile.buildx b/kubernetes/kubernetes-release/Dockerfile.buildx index 13ab9f7cd..dd503baef 100644 --- a/kubernetes/kubernetes-release/Dockerfile.buildx +++ b/kubernetes/kubernetes-release/Dockerfile.buildx @@ -6,7 +6,7 @@ FROM alpine -ARG KUBERNETES_VERSION=v1.29.0 +ARG KUBERNETES_VERSION=v1.30.0 # ARG KUBERNETES_VERSION= diff --git a/kubernetes/kubernetes-release/release/stable.txt b/kubernetes/kubernetes-release/release/stable.txt index 9b277b94a..c8c2eaea5 100644 --- a/kubernetes/kubernetes-release/release/stable.txt +++ b/kubernetes/kubernetes-release/release/stable.txt @@ -1 +1 @@ -v1.29.0 +v1.30.0 diff --git a/kubernetes/rpi/README.md b/kubernetes/rpi/README.md index 30dce3a17..67aececcc 100644 --- a/kubernetes/rpi/README.md +++ b/kubernetes/rpi/README.md @@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item pi@192.168.199.101:/home/pi/ln $ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter" -$ foreach($item in $items){scp ./kubernetes-release/release/v1.29.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} +$ foreach($item in $items){scp ./kubernetes-release/release/v1.30.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/} ``` ## 登录到树莓派 diff --git a/kubernetes/wsl2/00-README.NODE.md b/kubernetes/wsl2/00-README.NODE.md index c340c8d50..9da5efe20 100644 --- a/kubernetes/wsl2/00-README.NODE.md +++ b/kubernetes/wsl2/00-README.NODE.md @@ -44,8 +44,8 @@ $ ./wsl2/bin/kube-check $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" $ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s" -# 请将 1.29.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.29.0' +# 请将 1.30.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.30.0' $ wsl -d wsl-k8s -- sh -xc 'mkdir -p ${K8S_ROOT:?err}/bin' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/{kube-proxy,kubectl,kubelet,kubeadm,mounter} ${K8S_ROOT:?err}/bin' diff --git a/kubernetes/wsl2/00-README.SERVER.md b/kubernetes/wsl2/00-README.SERVER.md index c9d093ac6..91392885e 100644 --- a/kubernetes/wsl2/00-README.SERVER.md +++ b/kubernetes/wsl2/00-README.SERVER.md @@ -211,8 +211,8 @@ $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.yaml $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.kubeconfig ${K8S_ROOT:?err}/etc/kubernetes' $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION" -# 请将 1.29.0 替换为实际的 k8s 版本号 -$ $env:KUBERNETES_VERSION='1.29.0' +# 请将 1.30.0 替换为实际的 k8s 版本号 +$ $env:KUBERNETES_VERSION='1.30.0' $ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/kube-{apiserver,controller-manager,scheduler} ${K8S_ROOT:?err}/bin' ``` diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json index e218883c4..85a79ac0f 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json @@ -29,5 +29,5 @@ }, "url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", "url-mirror": "https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml index abca64cf2..7611f1a63 100644 --- a/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml @@ -1,5 +1,5 @@ name: crictl -version: 1.29.0 +version: 1.30.0 url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" url-mirror: https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz command: crictl diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json index 298101c85..d1a7a9b60 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json @@ -30,5 +30,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n", "install": "curl -L `\n https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/windows/amd64/kubectl.exe `\n -o C:/bin/kubectl.exe\n" }, - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml index a37e1e796..132ddeb20 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml @@ -1,5 +1,5 @@ name: kubectl -version: 1.29.0 +version: 1.30.0 # url: "https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/linux/amd64/kubectl" # url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json index bc9048874..67a126ce5 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json @@ -21,5 +21,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml index eef1b318e..8eb130123 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-node -version: 1.29.0 +version: 1.30.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if($IsMacOS){echo $False} diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json index 5c6b8d8a2..a569a0543 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.json @@ -17,5 +17,5 @@ "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n" }, "url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz", - "version": "1.29.0" + "version": "1.30.0" } diff --git a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml index 10a468e7c..82d145151 100644 --- a/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml +++ b/windows/lnmp-windows-pm-repo/k8s/kubernetes-server/lwpm.yml @@ -1,5 +1,5 @@ name: kubernetes-server -version: 1.29.0 +version: 1.30.0 url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz" scripts: platform-reqs: if(!$IsLinux){echo $False}