Skip to content

Commit 43eb77c

Browse files
khs1994khs1994
committed
[k8s] Test v1.35.0-rc.0 [sync git]
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent 995de8a commit 43eb77c

File tree

20 files changed

+1099
-32
lines changed

20 files changed

+1099
-32
lines changed

‎.github/workflows/lwpm-dist-file.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
if: matrix.os == 'ubuntu' &&
6464
( contains( github.event.head_commit.message, '[k8s]') || github.event_name == 'workflow_dispatch')
6565
env:
66-
VERSION: 2.2.0-beta.1
66+
VERSION: 2.2.0
6767
run: |
6868
$env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
6969
$env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_
@@ -111,7 +111,7 @@ jobs:
111111
if: matrix.os == 'windows' &&
112112
( contains( github.event.head_commit.message, '[k8s]') || github.event_name == 'workflow_dispatch')
113113
env:
114-
VERSION: 1.3.0
114+
VERSION: 1.4.0
115115
run: |
116116
$env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
117117
$env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_

‎dockerfile/php/.github/workflows/php_8_5.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
PHP_VERSION:
1010
description: php version
1111
required: true
12-
default: "8.5.0RC1"
12+
default: "8.5.0"
1313

1414
name: PHP_8.5
1515

@@ -219,7 +219,7 @@ jobs:
219219
PLATFORM: linux/amd64,linux/arm64 #,linux/arm/v7
220220
PHP_VERSION: 8_5_X
221221
FOLDER: "8.5"
222-
PHP_TAG_VERSION: "8.5.0RC1"
222+
PHP_TAG_VERSION: "8.5.0"
223223
TYPE: ${{ matrix.TYPE }}
224224
add_mirror: registry.us-east-1.aliyuncs.com/khs1994-us/php docker.cnb.cool/khs1994-docker/khs1994/php ghcr.io/khs1994/php
225225
add_mirror2: ghcr.io/lrew/php docker.cnb.cool/khs1994-docker/lrew/php

‎dockerfile/php/8.5/cli/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
389389
php-memcached/php-memcached:dev-master \
390390
--enable-memcached-igbinary \
391391
&& pie -n install ${PIE_CONFIG} \
392-
xdebug/xdebug:dev-master \
392+
xdebug/xdebug \
393393
&& docker-php-ext-enable zstd \
394394
&& echo "extension=redis" > $PHP_INI_DIR/conf.d/docker-php-ext-z-redis.ini \
395395
&& echo "extension=memcached" > $PHP_INI_DIR/conf.d/docker-php-ext-z-memcached.ini \

‎dockerfile/php/8.5/fpm/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ RUN --mount=type=bind,from=ghcr.io/php/pie:nightly-bin,source=/,target=/opt/bin2
166166
php-memcached/php-memcached:dev-master \
167167
--enable-memcached-igbinary \
168168
&& pie -n install ${PIE_CONFIG} \
169-
xdebug/xdebug:dev-master \
169+
xdebug/xdebug \
170170
&& docker-php-ext-enable zstd \
171171
redis \
172172
memcached \

‎dockerfile/php/8.5/zts/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ RUN --mount=type=bind,from=upstream,source=/usr/local/bin,target=/opt/bin,rw \
411411
php-memcached/php-memcached:dev-master \
412412
--enable-memcached-igbinary \
413413
&& pie -n install ${PIE_CONFIG} \
414-
xdebug/xdebug:dev-master \
414+
xdebug/xdebug \
415415
&& docker-php-ext-enable zstd \
416416
&& echo "extension=redis" > $PHP_INI_DIR/conf.d/docker-php-ext-z-redis.ini \
417417
&& echo "extension=memcached" > $PHP_INI_DIR/conf.d/docker-php-ext-z-memcached.ini \

‎kubernetes/.env.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ CNI_VERSION=1.8.0
2121
CRICTL_VERSION=1.34.0
2222
NGINX_VERSION=1.29.1
2323
# https://github.com/containerd/containerd/releases
24-
CONTAINERD_VERSION=2.1.4
24+
CONTAINERD_VERSION=2.2.0
2525
# https://github.com/containers/conmon/releases
2626
CONMON_VERSION=2.1.13
2727
# https://github.com/containers/crun/releases
2828
CRUN_VERSION=1.24
2929
# https://github.com/opencontainers/runc/releases
30-
RUNC_VERSION=1.3.0
30+
RUNC_VERSION=1.4.0
3131
# https://github.com/istio/istio/releases
3232
ISTIO_VERSION=1.27.0
3333

‎kubernetes/.github/workflows/setup-k8s.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
# next version
4949
- os: ubuntu
5050
dist: 22.04
51-
CI_KUBERNETES_VERSION: 1.35.0-alpha.1
51+
CI_KUBERNETES_VERSION: 1.35.0-rc.0
5252
LNMP_K8S_GET: --url
5353
GENERATE_CLI_HELP: "true"
5454
LNMP_K8S_NEXT_VERSION: "true"
5555
GOARCH: amd64
5656
- os: ubuntu
5757
dist: 22.04-arm
58-
CI_KUBERNETES_VERSION: 1.35.0-alpha.1
58+
CI_KUBERNETES_VERSION: 1.35.0-rc.0
5959
LNMP_K8S_GET: --url
6060
# GENERATE_CLI_HELP: "true"
6161
GOARCH: arm64
@@ -280,7 +280,7 @@ jobs:
280280
281281
sudo systemctl cat docker
282282
283-
sudo systemctl cat cri-containerd@2.1
283+
sudo systemctl cat cri-containerd@2.2
284284
285285
sudo systemctl cat cri-o || true
286286
sudo cat /etc/sysconfig/crio || true
@@ -296,7 +296,7 @@ jobs:
296296
sudo rm -rf /etc/crio/crio.conf.d/00-default.conf || true
297297
298298
test -z "${LNMP_K8S_LOCAL_INSTALL_OPTIONS}" \
299-
&& (sudo systemctl daemon-reload ; sudo systemctl start cri-containerd@2.1) || true
299+
&& (sudo systemctl daemon-reload ; sudo systemctl start cri-containerd@2.2) || true
300300
test "${LNMP_K8S_LOCAL_INSTALL_OPTIONS}" = "--docker" \
301301
&& (sudo systemctl restart docker || sudo journalctl -u docker) || true
302302
test "${LNMP_K8S_LOCAL_INSTALL_OPTIONS}" = "--crio" \
@@ -345,7 +345,7 @@ jobs:
345345
346346
sudo journalctl -u kube-proxy
347347
sudo journalctl -u kubelet${KUBELET_SERVICE}
348-
sudo journalctl -u cri-containerd@2.1 || true
348+
sudo journalctl -u cri-containerd@2.2 || true
349349
sudo journalctl -u cri-o || true
350350
351351
kubectl get csr

‎kubernetes/lnmp-k8s‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,10 @@ _containerd_install(){
604604
fi
605605

606606
if [ -f ${K8S_ROOT}/bin/cri-containerd -a ! "$1" = "--dry-run" ];then \
607-
print_info "containerd 2.1 already install"; \
607+
print_info "containerd 2.2 already install"; \
608608
${K8S_ROOT}/bin/cri-containerd --version;return; fi
609609

610-
print_info "install containerd 2.1 ..."
610+
print_info "install containerd 2.2 ..."
611611

612612
local url_official="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}"
613613

@@ -655,7 +655,7 @@ _containerd_install(){
655655
# $(_sudo) $(_curl) ${sha256sum_url} -o ${TMP_ROOT}/${TAR_FILE}.sha256sum
656656

657657
if [ -n "$WSL2_SYSTEMD" ];then
658-
_enable_wsl_k8s_systemd_target cri-containerd@.service cri-containerd@2.1.service
658+
_enable_wsl_k8s_systemd_target cri-containerd@.service cri-containerd@2.2.service
659659
_enable_wsl_k8s_systemd_target kubelet@.service kubelet@cri-containerd.service
660660

661661
$(_sudo) rm -rf /etc/systemd/system/wsl-k8s.target.wants/cri-o.service
@@ -923,7 +923,7 @@ _crio_install(){
923923
_enable_wsl_k8s_systemd_target cri-o.service cri-o.service
924924
_enable_wsl_k8s_systemd_target kubelet@.service kubelet@crio.service
925925

926-
$(_sudo) rm -rf /etc/systemd/system/wsl-k8s.target.wants/cri-containerd@2.1.service
926+
$(_sudo) rm -rf /etc/systemd/system/wsl-k8s.target.wants/cri-containerd@2.2.service
927927
$(_sudo) rm -rf /etc/systemd/system/wsl-k8s.target.wants/kubelet@cri-containerd.service
928928
fi
929929

@@ -1080,14 +1080,14 @@ _crio_config(){
10801080
# https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd
10811081
_containerd_cri_config(){
10821082
print_info "config containerd ..."
1083-
local CONTAINERD_CONF_ROOT=${K8S_ROOT}/etc/cri-containerd/2.1
1083+
local CONTAINERD_CONF_ROOT=${K8S_ROOT}/etc/cri-containerd/2.2
10841084
$(_sudo) mkdir -p $CONTAINERD_CONF_ROOT/certs.d
10851085
# containerd config default > ${K8S_ROOT}/etc/cri-containerd/config.toml
1086-
sed "s!/opt/k8s!${K8S_ROOT}!g" systemd/etc/cri-containerd/2.1/config.toml \
1086+
sed "s!/opt/k8s!${K8S_ROOT}!g" systemd/etc/cri-containerd/2.2/config.toml \
10871087
| $(_sudo) tee $CONTAINERD_CONF_ROOT/config.toml
10881088

10891089
# if ! [ "${LNMP_CN_ENV}" = 'false' ];then
1090-
# $(_sudo) cp -r systemd/etc/cri-containerd/2.1/certs.d $CONTAINERD_CONF_ROOT
1090+
# $(_sudo) cp -r systemd/etc/cri-containerd/2.2/certs.d $CONTAINERD_CONF_ROOT
10911091
# fi
10921092

10931093
if [ -n "$GITHUB_ACTIONS" ];then
@@ -1565,7 +1565,7 @@ $ $(_sudo) systemctl start kubelet@cri-containerd
15651565
$ $(_sudo) systemctl start kubelet@crio
15661566
15671567
$ $(_sudo) systemctl start docker (Docker runtime only)
1568-
$ $(_sudo) systemctl start cri-containerd@2.1 (Containerd runtime only)
1568+
$ $(_sudo) systemctl start cri-containerd@2.2 (Containerd runtime only)
15691569
$ $(_sudo) systemctl start cri-o (CRI-O runtime only)
15701570
"
15711571
}
@@ -1574,7 +1574,7 @@ _local_cleanup(){
15741574
$(_sudo) systemctl stop etcd \
15751575
kube-apiserver kube-controller-manager kube-scheduler \
15761576
kube-proxy kubelet \
1577-
docker cri-containerd@2.1 crio || true
1577+
docker cri-containerd@2.2 crio || true
15781578

15791579
set +e
15801580
$(_sudo) rm -rf ${K8S_ROOT}

0 commit comments

Comments
 (0)