Skip to content

Commit 995de8a

Browse files
committed
[k8s] update pkg version
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent bcca2ec commit 995de8a

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

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

Lines changed: 3 additions & 3 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.1.4
66+
VERSION: 2.2.0-beta.1
6767
run: |
6868
$env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
6969
$env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_
@@ -135,7 +135,7 @@ jobs:
135135
if: matrix.os == 'windows' &&
136136
( contains( github.event.head_commit.message, '[k8s]') || github.event_name == 'workflow_dispatch')
137137
env:
138-
VERSION: 1.23.1
138+
VERSION: 1.24
139139
run: |
140140
$env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
141141
$env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_
@@ -183,7 +183,7 @@ jobs:
183183
if: matrix.os == 'windows' &&
184184
( contains( github.event.head_commit.message, '[k8s]') || github.event_name == 'workflow_dispatch')
185185
env:
186-
VERSION: 1.7.1
186+
VERSION: 1.8.0
187187
run: |
188188
$env:LWPM_DOCKER_USERNAME=$env:LWPM_DOCKER_USERNAME_
189189
$env:LWPM_DOCKER_PASSWORD=$env:LWPM_DOCKER_PASSWORD_

kubernetes/.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ETCD_VERSION=3.6.1
1616
HELM_VERSION=3.18.6
1717
# https://github.com/containernetworking/cni/releases
1818
# https://github.com/containernetworking/plugins/releases
19-
CNI_VERSION=1.7.1
19+
CNI_VERSION=1.8.0
2020
# https://github.com/kubernetes-sigs/cri-tools/releases
2121
CRICTL_VERSION=1.34.0
2222
NGINX_VERSION=1.29.1
@@ -25,7 +25,7 @@ CONTAINERD_VERSION=2.1.4
2525
# https://github.com/containers/conmon/releases
2626
CONMON_VERSION=2.1.13
2727
# https://github.com/containers/crun/releases
28-
CRUN_VERSION=1.23.1
28+
CRUN_VERSION=1.24
2929
# https://github.com/opencontainers/runc/releases
3030
RUNC_VERSION=1.3.0
3131
# https://github.com/istio/istio/releases

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
CI_KUBERNETES_VERSION: 1.31.13
111111
LNMP_K8S_GET: --url
112112
GOARCH: amd64
113-
fail-fast: true
113+
fail-fast: false
114114
steps:
115115
- uses: actions/checkout@v3
116116
with:

windows/lnmp-windows-pm-repo/k8s/cni/lwpm.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
}
2020
],
2121
"scripts": {
22-
"dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\n# https://github.com/containernetworking/plugins/releases/download/v1.7.1/cni-plugins-linux-amd64-v1.7.1.tgz\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n"
22+
"dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\n# https://github.com/containernetworking/plugins/releases/download/v1.8.0/cni-plugins-linux-amd64-v1.8.0.tgz\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n"
2323
},
2424
"url": "https://github.com/containernetworking/plugins/releases/download/v${VERSION}/cni-plugins-${env:lwpm_os}-${env:lwpm_architecture}-v${VERSION}.tgz",
25-
"version": "1.7.1"
25+
"version": "1.8.0"
2626
}

windows/lnmp-windows-pm-repo/k8s/cni/lwpm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: cni
2-
version: 1.7.1
2+
version: 1.8.0
33
url: "https://github.com/containernetworking/plugins/releases/download/v${VERSION}/cni-plugins-${env:lwpm_os}-${env:lwpm_architecture}-v${VERSION}.tgz"
44
scripts:
55
dist: |
66
_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}
77
8-
# https://github.com/containernetworking/plugins/releases/download/v1.7.1/cni-plugins-linux-amd64-v1.7.1.tgz
8+
# https://github.com/containernetworking/plugins/releases/download/v1.8.0/cni-plugins-linux-amd64-v1.8.0.tgz
99
curl -L `
1010
$url `
1111
-o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename

windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"architecture": "amd64"
2121
}
2222
],
23-
"pre-version": "2.1.4",
23+
"pre-version": "2.2.0-beta.1",
2424
"scripts": {
2525
"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",
2626
"install": "tar -zxvf $filename -C C:\\\n",
@@ -34,5 +34,5 @@
3434
},
3535
"url": "https://github.com/containerd/containerd/releases/download/v${VERSION}/containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
3636
"url-mirror": "https://${env:GITHUB_MIRROR}/containerd/containerd/releases/download/v${VERSION}/containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
37-
"version": "2.1.4"
37+
"version": "2.2.0-beta.1"
3838
}

windows/lnmp-windows-pm-repo/k8s/containerd/lwpm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: containerd
2-
version: 2.1.4
3-
pre-version: 2.1.4
2+
version: 2.2.0-beta.1
3+
pre-version: 2.2.0-beta.1
44
url: "https://github.com/containerd/containerd/releases/download/v${VERSION}/containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
55
url-mirror: https://${env:GITHUB_MIRROR}/containerd/containerd/releases/download/v${VERSION}/containerd-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz
66
scripts:

windows/lnmp-windows-pm-repo/k8s/crun/lwpm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
"platform-reqs": "if(!$IsLinux){echo $False}"
1616
},
1717
"url": "https://github.com/containers/crun/releases/download/${VERSION}/crun-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}",
18-
"version": "1.23.1"
18+
"version": "1.24"
1919
}

windows/lnmp-windows-pm-repo/k8s/crun/lwpm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: crun
2-
version: "1.23.1"
2+
version: "1.24"
33
url: "https://github.com/containers/crun/releases/download/${VERSION}/crun-${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}"
44
scripts:
55
platform-reqs: if(!$IsLinux){echo $False}

0 commit comments

Comments
 (0)