[kubernetes] stable version is 1.33.0 [sync git]

khs1994 · khs1994 · commit 4f2ab4aace7f · 2025-07-06T17:52:15.000+08:00
Signed-off-by: Kang Huaishuai &lt;khs1994@khs1994.com&gt;
diff --git a/.github/workflows/lwpm-dist-file.yaml b/.github/workflows/lwpm-dist-file.yaml
@@ -74,7 +74,7 @@ jobs:
         if: matrix.os == 'windows' &&
             ( contains( github.event.head_commit.message, '[k8s]') || github.event_name == 'workflow_dispatch')
         env:
-          VERSION: 1.32.0
+          VERSION: 1.33.0
         run: |
           $env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
           $env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_
diff --git a/.github/workflows/lwpm-dist-k8s-file.yaml b/.github/workflows/lwpm-dist-k8s-file.yaml
@@ -6,7 +6,7 @@ on:
       LWPM_K8S_VERSION:
         description: k8s version
         required: true
-        default: 1.32.0
+        default: 1.33.0
 
 env:
   LWPM_K8S_VERSION: ${{ github.event.inputs.LWPM_K8S_VERSION }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Compare
 
-* https://github.com/khs1994-docker/lnmp/compare/v24.11.0...23.11
+* https://github.com/khs1994-docker/lnmp/compare/24.11...23.11
 
 ### Bug fixes:
 
diff --git a/dockerfile/php/README.md b/dockerfile/php/README.md
@@ -23,7 +23,9 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`8.4.10-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.4.10/8.2/fpm/Dockerfile)
+* [`8.4.10-fpm-alpine` (8.4/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.4.10/8.4/fpm/Dockerfile)
+
+* [`8.3.12-fpm-alpine` (8.3/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.4.10/8.3/fpm/Dockerfile)
 
 * [`8.2.26-fpm-alpine` (8.2/fpm/Dockerfile)](https://github.com/khs1994-docker/php/blob/8.4.10/8.2/fpm/Dockerfile)
 
diff --git a/kubernetes/.env.example b/kubernetes/.env.example
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION=1.32.0
+KUBERNETES_VERSION=1.33.0
 
 # KUBERNETES_VERSION=
 
@@ -18,7 +18,7 @@ HELM_VERSION=3.18.2
 # https://github.com/containernetworking/plugins/releases
 CNI_VERSION=1.7.1
 # https://github.com/kubernetes-sigs/cri-tools/releases
-CRICTL_VERSION=1.32.0
+CRICTL_VERSION=1.33.0
 NGINX_VERSION=1.27.0
 # https://github.com/containerd/containerd/releases
 CONTAINERD_VERSION=2.0.0
diff --git a/kubernetes/.github/workflows/setup-k8s.yaml b/kubernetes/.github/workflows/setup-k8s.yaml
@@ -32,8 +32,8 @@ jobs:
      GENERATE_CLI_HELP: ${{matrix.GENERATE_CLI_HELP}}
      IPV6: ${{matrix.IPV6}}
      DOWNLOAD_FROM_CODING: "false"
-     LNMP_K8S_STABLE_VERSION: "1.32.0"
-     LNMP_K8S_NEXT_VERSION: "1.33.0"
+     LNMP_K8S_STABLE_VERSION: "1.33.0"
+     LNMP_K8S_NEXT_VERSION: ${{matrix.LNMP_K8S_NEXT_VERSION}}
    strategy:
      max-parallel: 1
      matrix:
@@ -48,25 +48,26 @@ jobs:
       # next version
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.33.0
+         CI_KUBERNETES_VERSION: 1.34.0-alpha.2
          LNMP_K8S_GET: --url
          GENERATE_CLI_HELP: "true"
+         LNMP_K8S_NEXT_VERSION: "true"
        - os: ubuntu
          dist: 22.04-arm
-         CI_KUBERNETES_VERSION: 1.33.0
+         CI_KUBERNETES_VERSION: 1.34.0-alpha.2
          LNMP_K8S_GET: --url
         #  GENERATE_CLI_HELP: "true"
 
        # current stable version
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.32.0
+         CI_KUBERNETES_VERSION: 1.33.0
          LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio
          K8S_IMAGE_NS: khs1994
          K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.32.0
+         CI_KUBERNETES_VERSION: 1.33.0
          LNMP_K8S_GET: --url
 
          GENERATE_CLI_HELP: "true"
@@ -78,7 +79,7 @@ jobs:
        #  IPV6: "true"
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.32.0
+         CI_KUBERNETES_VERSION: 1.33.0
          LNMP_K8S_GET: --url
          CNI_CALICO_EBPF: 'true'
       # v1.24.0+ not support docker
@@ -88,21 +89,21 @@ jobs:
       #    LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.32.0
+         CI_KUBERNETES_VERSION: 1.33.0
          LNMP_K8S_GET: --url
          K8S_ROOT: /opt/k8s-custom
        # old version
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.31.6
+         CI_KUBERNETES_VERSION: 1.32.6
          LNMP_K8S_GET: --url
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.30.11
+         CI_KUBERNETES_VERSION: 1.31.10
          LNMP_K8S_GET: --url
        - os: ubuntu
          dist: 22.04
-         CI_KUBERNETES_VERSION: 1.29.15
+         CI_KUBERNETES_VERSION: 1.30.14
          LNMP_K8S_GET: --url
      fail-fast: false
    steps:
@@ -547,7 +548,7 @@ jobs:
          BASE_BRANCH=v1.29.0-alpha.1-config
          BASE_BRANCH=master
          #  BASE_BRANCH=v1.28.0-config
-         if ! [ $CI_KUBERNETES_VERSION = ${LNMP_K8S_NEXT_VERSION} -a "$GENERATE_CLI_HELP" = "true" ];then
+         if ! [ $LNMP_K8S_NEXT_VERSION = "true" -a "$GENERATE_CLI_HELP" = "true" ];then
            exit 0
          fi
 
diff --git 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.32.0 `
+  kubernetes-node@1.33.0 `
   --all-platform
 
 $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR
 
-./lnmp/windows/lnmp-windows-pm.ps1 push    kubernetes-node@1.32.0
+./lnmp/windows/lnmp-windows-pm.ps1 push    kubernetes-node@1.33.0
diff --git a/kubernetes/cfssl/Dockerfile b/kubernetes/cfssl/Dockerfile
@@ -1,6 +1,6 @@
 FROM --platform=${TARGETPLATFORM} alpine:edge as tool
 
-ENV KUBECTL_VERSION=v1.32.0
+ENV KUBECTL_VERSION=v1.33.0
 
 ARG TARGETARCH
 
diff --git 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.32.0
+    image: registry.k8s.io/kube-apiserver:v1.33.0
 
   etcd:
     image: quay.io/coreos/etcd:v3.6.1
diff --git a/kubernetes/kubernetes-release/Dockerfile b/kubernetes/kubernetes-release/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.16
 
-ENV KUBERNETES_VERSION=v1.32.0
+ENV KUBERNETES_VERSION=v1.33.0
 
 # ENV KUBERNETES_VERSION=
 
diff --git a/kubernetes/kubernetes-release/Dockerfile.buildx b/kubernetes/kubernetes-release/Dockerfile.buildx
@@ -6,7 +6,7 @@
 
 FROM alpine
 
-ARG KUBERNETES_VERSION=v1.32.0
+ARG KUBERNETES_VERSION=v1.33.0
 
 # ARG KUBERNETES_VERSION=
 
diff --git a/kubernetes/kubernetes-release/release/stable.txt b/kubernetes/kubernetes-release/release/stable.txt
@@ -1 +1 @@
-v1.32.0
+v1.33.0
diff --git 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.32.0-linux-arm64/kubernetes/server/bin/$item pi@192.168.199.101:/home/pi/}
+$ foreach($item in $items){scp ./kubernetes-release/release/v1.33.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
@@ -38,8 +38,8 @@ export PATH=/wsl/wsl-k8s-data/k8s/bin:$PATH
 ```powershell
 $ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION"
 $ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s"
-# 请将 1.32.0 替换为实际的 k8s 版本号
-$ $env:KUBERNETES_VERSION='1.32.0'
+# 请将 1.33.0 替换为实际的 k8s 版本号
+$ $env:KUBERNETES_VERSION='1.33.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
@@ -79,13 +79,13 @@ $ wsl --shutdown
 ## 获取 kubernetes
 
 ```powershell
-$ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.32.0 ./lnmp-k8s kubernetes-server --url
+$ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.33.0 ./lnmp-k8s kubernetes-server --url
 # 如果上面的命令出现错误，可以执行这个命令
-# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.32.0 ./lnmp-k8s kubernetes-server
+# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.33.0 ./lnmp-k8s kubernetes-server
 
 # 其他架构
-# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.32.0 ./lnmp-k8s kubernetes-server --url linux arm64
-# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.32.0 ./lnmp-k8s kubernetes-server linux arm64
+# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.33.0 ./lnmp-k8s kubernetes-server --url linux arm64
+# $ wsl -d wsl-k8s -- KUBERNETES_VERSION=1.33.0 ./lnmp-k8s kubernetes-server linux arm64
 ```
 
 ## 生成证书文件
@@ -123,8 +123,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.32.0 替换为实际的 k8s 版本号
-$ $env:KUBERNETES_VERSION='1.32.0'
+# 请将 1.33.0 替换为实际的 k8s 版本号
+$ $env:KUBERNETES_VERSION='1.33.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
@@ -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.32.0"
+  "version": "1.33.0"
 }
diff --git 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.32.0
+version: 1.33.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
@@ -30,5 +30,5 @@
     "dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n  https://cdn.dl.k8s.io/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.32.0"
+  "version": "1.33.0"
 }
diff --git 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.32.0
+version: 1.33.0
 # url: "https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/linux/amd64/kubectl"
 # url: "https://cdn.dl.k8s.io/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
@@ -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://cdn.dl.k8s.io/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
-  "version": "1.32.0"
+  "version": "1.33.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
@@ -1,5 +1,5 @@
 name: kubernetes-node
-version: 1.32.0
+version: 1.33.0
 url: "https://cdn.dl.k8s.io/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
@@ -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://cdn.dl.k8s.io/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
-  "version": "1.32.0"
+  "version": "1.33.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
@@ -1,5 +1,5 @@
 name: kubernetes-server
-version: 1.32.0
+version: 1.33.0
 url: "https://cdn.dl.k8s.io/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
 scripts:
   platform-reqs: if(!$IsLinux){echo $False}
