Sync from khs1994-docker/lnmp@7944c07 by PCIT

khs1994-docker · Aug 18, 2023 · c42f3a8 · c42f3a8
1 parent bb459a9
commit c42f3a8
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 41 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION=1.27.0
+KUBERNETES_VERSION=1.28.0
 
 # KUBERNETES_VERSION=
 
@@ -19,7 +19,7 @@ HELM_VERSION=3.11.3
 CNI_VERSION=1.2.0
 # https://github.com/kubernetes-sigs/cri-tools/releases
 CRICTL_VERSION=1.27.0
-NGINX_VERSION=1.23.3
+NGINX_VERSION=1.25.1
 # https://github.com/containerd/containerd/releases
 CONTAINERD_VERSION=1.7.0
 # https://github.com/containers/conmon/releases

diff --git a/.github/workflows/setup-k8s.yaml b/.github/workflows/setup-k8s.yaml
@@ -44,23 +44,23 @@ jobs:
       #    GENERATE_CLI_HELP: "true"
 
       # next version
-       - os: ubuntu
-         dist: 20.04
-         CI_KUBERNETES_VERSION: 1.28.0-beta.0
-         LNMP_K8S_GET: --url
-         GENERATE_CLI_HELP: "true"
+      #  - os: ubuntu
+      #    dist: 20.04
+      #    CI_KUBERNETES_VERSION: 1.29.0-alpha.1
+      #    LNMP_K8S_GET: --url
+      #    GENERATE_CLI_HELP: "true"
 
        # current stable version
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.27.0
+         CI_KUBERNETES_VERSION: 1.28.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.27.0
+         CI_KUBERNETES_VERSION: 1.28.0
          LNMP_K8S_GET: --url
 
          GENERATE_CLI_HELP: "true"
@@ -69,12 +69,12 @@ jobs:
        # ipv6
        # - os: ubuntu
        #  dist: 20.04
-       #  CI_KUBERNETES_VERSION: 1.27.0
+       #  CI_KUBERNETES_VERSION: 1.28.0
        #  LNMP_K8S_GET: --url
        #  IPV6: "true"
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.27.0
+         CI_KUBERNETES_VERSION: 1.28.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.27.0
+         CI_KUBERNETES_VERSION: 1.28.0
          LNMP_K8S_GET: --url
          K8S_ROOT: /opt/k8s-custom
        # old version
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.26.4
+         CI_KUBERNETES_VERSION: 1.27.4
          LNMP_K8S_GET: --url
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.25.9
+         CI_KUBERNETES_VERSION: 1.26.7
          LNMP_K8S_GET: --url
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.24.13
+         CI_KUBERNETES_VERSION: 1.25.12
          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.27.0' -a "$GENERATE_CLI_HELP" = "true" ];then
+         if ! [ $CI_KUBERNETES_VERSION = '1.28.0' -a "$GENERATE_CLI_HELP" = "true" ];then
            exit 0
          fi
 
@@ -542,9 +542,9 @@ jobs:
        run:
         |
          export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
-         BASE_BRANCH=v1.28.0-alpha.2-config
-         # BASE_BRANCH=master
-         if [ $CI_KUBERNETES_VERSION != '1.28.0-beta.0' ];then
+         BASE_BRANCH=v1.29.0-alpha.1-config
+         BASE_BRANCH=master
+         if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then
            exit 0
          fi
 
@@ -571,8 +571,8 @@ jobs:
         |
          export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
          BASE_BRANCH=v1.28.0-alpha.1
-         # BASE_BRANCH=master
-         if [ $CI_KUBERNETES_VERSION != '1.29.0-alpha.1' ];then
+         BASE_BRANCH=master
+         if [ $CI_KUBERNETES_VERSION != 'x.y.z-alpha.1' ];then
            exit 0
          fi
 

diff --git a/bin/lwpm.ps1 b/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.27.0 `
+  kubernetes-node@1.28.0 `
   --all-platform
 
 $env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR
 
-./lnmp/windows/lnmp-windows-pm.ps1 push    kubernetes-node@1.27.0
+./lnmp/windows/lnmp-windows-pm.ps1 push    kubernetes-node@1.28.0
diff --git a/cfssl/Dockerfile b/cfssl/Dockerfile
@@ -1,6 +1,6 @@
 FROM --platform=${TARGETPLATFORM} alpine:edge as tool
 
-ENV KUBECTL_VERSION=v1.27.0
+ENV KUBECTL_VERSION=v1.28.0
 
 ARG TARGETARCH
 

diff --git a/coreos/ignition/bu/kube-nginx.bu b/coreos/ignition/bu/kube-nginx.bu
@@ -18,8 +18,8 @@ systemd:
         # ExecStart=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx
         # ExecReload=${K8S_ROOT}/kube-nginx/sbin/nginx -c ${K8S_ROOT}/kube-nginx/conf/kube-nginx.conf -p ${K8S_ROOT}/kube-nginx -s reload
         ExecStartPre=-/bin/podman container rm kube-nginx
-        ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.23.3 -t
-        ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.23.3
+        ExecStartPre=/bin/podman container run --rm $OPTIONS khs1994/kube-nginx:1.25.1 -t
+        ExecStart=/bin/podman container run --name kube-nginx $OPTIONS khs1994/kube-nginx:1.25.1
         ExecStop=/bin/podman container stop kube-nginx
         ExecStopPost=/bin/podman container rm kube-nginx
         PrivateTmp=true

diff --git a/coreos/server/Dockerfile b/coreos/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.23.3-alpine
+FROM nginx:1.25.1-alpine
 
 LABEL maintainer="[email protected]"
 

diff --git a/docker-compose.bump.yml b/docker-compose.bump.yml
@@ -2,7 +2,7 @@
 
 services:
   k8s_apiserver:
-    image: registry.k8s.io/kube-apiserver:v1.27.0
+    image: registry.k8s.io/kube-apiserver:v1.28.0
 
   etcd:
     image: quay.io/coreos/etcd:v3.5.8

diff --git a/kube-nginx/Dockerfile b/kube-nginx/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.16
 
-ENV NGINX_VERSION=1.23.3
+ENV NGINX_VERSION=1.25.1
 
 RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
     && apk add --no-cache --virtual .build_deps \

diff --git a/kube-nginx/docker-compose.yml b/kube-nginx/docker-compose.yml
@@ -2,6 +2,6 @@
 
 services:
   kube-nginx:
-    image: khs1994/kube-nginx:1.23.3
+    image: khs1994/kube-nginx:1.25.1
     build:
       context: ./
diff --git a/kubernetes-release/Dockerfile b/kubernetes-release/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.16
 
-ENV KUBERNETES_VERSION=v1.27.0
+ENV KUBERNETES_VERSION=v1.28.0
 
 # ENV KUBERNETES_VERSION=
 

diff --git a/kubernetes-release/Dockerfile.buildx b/kubernetes-release/Dockerfile.buildx
@@ -6,7 +6,7 @@
 
 FROM alpine
 
-ARG KUBERNETES_VERSION=v1.27.0
+ARG KUBERNETES_VERSION=v1.28.0
 
 # ARG KUBERNETES_VERSION=
 

diff --git a/kubernetes-release/release/stable.txt b/kubernetes-release/release/stable.txt
@@ -1 +1 @@
-v1.27.0
+v1.28.0
diff --git a/lnmp/nginx/base/lnmp-nginx.yaml b/lnmp/nginx/base/lnmp-nginx.yaml
@@ -33,8 +33,8 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: lnmp-nginx
-        # image: khs1994/nginx:1.23.3-alpine
-        image: "nginx:1.23.3-alpine"
+        # image: khs1994/nginx:1.25.1-alpine
+        image: "nginx:1.25.1-alpine"
         # image: ranadeeppolavarapu/nginx-http3
         imagePullPolicy: IfNotPresent
         args:

diff --git a/lnmp/php/base/lnmp-php.yaml b/lnmp/php/base/lnmp-php.yaml
@@ -44,7 +44,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: lnmp-php
-        image: khs1994/php:8.2.4-fpm-alpine
+        image: khs1994/php:8.2.5-fpm-alpine
         imagePullPolicy: IfNotPresent
         args:
         - php-fpm

diff --git a/rpi/README.md b/rpi/README.md
@@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item [email protected]:/home/pi/ln
 
 $ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter"
 
-$ foreach($item in $items){scp ./kubernetes-release/release/v1.27.0-linux-arm64/kubernetes/server/bin/$item [email protected]:/home/pi/}
+$ foreach($item in $items){scp ./kubernetes-release/release/v1.28.0-linux-arm64/kubernetes/server/bin/$item [email protected]:/home/pi/}
 ```
 
 ## 登录到树莓派

diff --git a/wsl2/00-README.NODE.md b/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.27.0 替换为实际的 k8s 版本号
-$ $env:KUBERNETES_VERSION='1.27.0'
+# 请将 1.28.0 替换为实际的 k8s 版本号
+$ $env:KUBERNETES_VERSION='1.28.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/wsl2/00-README.SERVER.md b/wsl2/00-README.SERVER.md
@@ -209,8 +209,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.27.0 替换为实际的 k8s 版本号
-$ $env:KUBERNETES_VERSION='1.27.0'
+# 请将 1.28.0 替换为实际的 k8s 版本号
+$ $env:KUBERNETES_VERSION='1.28.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'
 ```