Skip to content

Commit 7db9ff1

Browse files
zhangzujianzhangzujian
authored
bump k8s version to v1.26.6 (#2973)
1 parent cc7768b commit 7db9ff1

File tree

6 files changed

+171
-149
lines changed

6 files changed

+171
-149
lines changed

‎.github/workflows/build-x86-image.yaml

+29-15
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,9 @@ jobs:
324324
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
325325

326326
- name: Install kind
327-
uses: helm/kind-action@v1
327+
uses: helm/kind-action@v1.7.0
328328
with:
329+
version: v0.20.0
329330
install_only: true
330331

331332
- name: Install ginkgo
@@ -458,8 +459,9 @@ jobs:
458459
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
459460

460461
- name: Install kind
461-
uses: helm/kind-action@v1
462+
uses: helm/kind-action@v1.7.0
462463
with:
464+
version: v0.20.0
463465
install_only: true
464466

465467
- name: Install ginkgo
@@ -601,8 +603,9 @@ jobs:
601603
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
602604

603605
- name: Install kind
604-
uses: helm/kind-action@v1
606+
uses: helm/kind-action@v1.7.0
605607
with:
608+
version: v0.20.0
606609
install_only: true
607610

608611
- name: Install ginkgo
@@ -721,8 +724,9 @@ jobs:
721724
fi
722725
723726
- name: Install kind
724-
uses: helm/kind-action@v1
727+
uses: helm/kind-action@v1.7.0
725728
with:
729+
version: v0.20.0
726730
install_only: true
727731

728732
- name: Install ginkgo
@@ -858,8 +862,9 @@ jobs:
858862
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
859863

860864
- name: Install kind
861-
uses: helm/kind-action@v1
865+
uses: helm/kind-action@v1.7.0
862866
with:
867+
version: v0.20.0
863868
install_only: true
864869

865870
- name: Install ginkgo
@@ -982,8 +987,9 @@ jobs:
982987
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
983988

984989
- name: Install kind
985-
uses: helm/kind-action@v1
990+
uses: helm/kind-action@v1.7.0
986991
with:
992+
version: v0.20.0
987993
install_only: true
988994

989995
- name: Install ginkgo
@@ -1022,8 +1028,9 @@ jobs:
10221028
- uses: actions/checkout@v3
10231029

10241030
- name: Install kind
1025-
uses: helm/kind-action@v1
1031+
uses: helm/kind-action@v1.7.0
10261032
with:
1033+
version: v0.20.0
10271034
install_only: true
10281035

10291036
- name: Download image
@@ -1057,8 +1064,9 @@ jobs:
10571064
- uses: actions/checkout@v3
10581065

10591066
- name: Install kind
1060-
uses: helm/kind-action@v1
1067+
uses: helm/kind-action@v1.7.0
10611068
with:
1069+
version: v0.20.0
10621070
install_only: true
10631071

10641072
- name: Download image
@@ -1092,8 +1100,9 @@ jobs:
10921100
- uses: actions/checkout@v3
10931101

10941102
- name: Install kind
1095-
uses: helm/kind-action@v1
1103+
uses: helm/kind-action@v1.7.0
10961104
with:
1105+
version: v0.20.0
10971106
install_only: true
10981107

10991108
- name: Download image
@@ -1129,8 +1138,9 @@ jobs:
11291138
- uses: actions/checkout@v3
11301139

11311140
- name: Install kind
1132-
uses: helm/kind-action@v1
1141+
uses: helm/kind-action@v1.7.0
11331142
with:
1143+
version: v0.20.0
11341144
install_only: true
11351145

11361146
- name: Download image
@@ -1206,8 +1216,9 @@ jobs:
12061216
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
12071217

12081218
- name: Install kind
1209-
uses: helm/kind-action@v1
1219+
uses: helm/kind-action@v1.7.0
12101220
with:
1221+
version: v0.20.0
12111222
install_only: true
12121223

12131224
- name: Install ginkgo
@@ -1253,8 +1264,9 @@ jobs:
12531264
- uses: actions/checkout@v3
12541265

12551266
- name: Install kind
1256-
uses: helm/kind-action@v1
1267+
uses: helm/kind-action@v1.7.0
12571268
with:
1269+
version: v0.20.0
12581270
install_only: true
12591271

12601272
- name: Download image
@@ -1269,7 +1281,7 @@ jobs:
12691281
run: |
12701282
sudo pip3 install j2cli
12711283
sudo pip3 install "j2cli[yaml]"
1272-
sudo PATH=~/.local/bin:$PATH k8s_version=v1.23.13 make kind-init
1284+
sudo PATH=~/.local/bin:$PATH k8s_version=v1.23.17 make kind-init
12731285
sudo cp -r /root/.kube/ ~/.kube/
12741286
sudo chown -R $(id -un). ~/.kube/
12751287
@@ -1335,8 +1347,9 @@ jobs:
13351347
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
13361348

13371349
- name: Install kind
1338-
uses: helm/kind-action@v1
1350+
uses: helm/kind-action@v1.7.0
13391351
with:
1352+
version: v0.20.0
13401353
install_only: true
13411354

13421355
- name: Install ginkgo
@@ -1432,8 +1445,9 @@ jobs:
14321445
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
14331446

14341447
- name: Install kind
1435-
uses: helm/kind-action@v1
1448+
uses: helm/kind-action@v1.7.0
14361449
with:
1450+
version: v0.20.0
14371451
install_only: true
14381452

14391453
- name: Install ginkgo

‎.trivyignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CVE-2023-2253

‎dist/images/Dockerfile.base

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ ARG ARCH
9696
ENV CNI_VERSION=v1.2.0
9797
RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan
9898

99-
ENV KUBE_VERSION="v1.24.12"
99+
ENV KUBE_VERSION="v1.26.6"
100100

101101
RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \
102102
&& chmod +x /usr/bin/kubectl && rm -rf ./kubernetes

‎go.mod

+56-56
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ require (
3434
github.com/spf13/pflag v1.0.5
3535
github.com/stretchr/testify v1.8.1
3636
github.com/vishvananda/netlink v1.2.1-beta.2
37-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
38-
golang.org/x/sys v0.6.0
37+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
38+
golang.org/x/sys v0.9.0
3939
golang.org/x/time v0.3.0
4040
google.golang.org/grpc v1.51.0
4141
google.golang.org/protobuf v1.28.1
4242
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 v3.9.2
43-
k8s.io/api v0.26.0
44-
k8s.io/apimachinery v0.26.0
45-
k8s.io/apiserver v0.26.0
43+
k8s.io/api v0.26.6
44+
k8s.io/apimachinery v0.26.6
45+
k8s.io/apiserver v0.26.6
4646
k8s.io/client-go v12.0.0+incompatible
47-
k8s.io/klog/v2 v2.80.1
48-
k8s.io/kubernetes v1.26.1
49-
k8s.io/pod-security-admission v0.26.0
50-
k8s.io/sample-controller v0.26.0
47+
k8s.io/klog/v2 v2.100.1
48+
k8s.io/kubernetes v1.26.6
49+
k8s.io/pod-security-admission v0.26.6
50+
k8s.io/sample-controller v0.26.6
5151
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
5252
kubevirt.io/client-go v0.58.0
5353
sigs.k8s.io/controller-runtime v0.14.1
@@ -166,7 +166,7 @@ require (
166166
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
167167
github.com/opencontainers/go-digest v1.0.0 // indirect
168168
github.com/opencontainers/image-spec v1.0.2 // indirect
169-
github.com/opencontainers/runc v1.1.4 // indirect
169+
github.com/opencontainers/runc v1.1.6 // indirect
170170
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
171171
github.com/opencontainers/selinux v1.10.0 // indirect
172172
github.com/openshift/api v0.0.0-20221103085154-ea838af1820e // indirect
@@ -197,7 +197,7 @@ require (
197197
github.com/subosito/gotenv v1.4.1 // indirect
198198
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
199199
github.com/vishvananda/netns v0.0.4 // indirect
200-
github.com/vmware/govmomi v0.20.3 // indirect
200+
github.com/vmware/govmomi v0.30.0 // indirect
201201
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
202202
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
203203
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
@@ -216,14 +216,14 @@ require (
216216
go.uber.org/atomic v1.9.0 // indirect
217217
go.uber.org/multierr v1.8.0 // indirect
218218
go.uber.org/zap v1.24.0 // indirect
219-
golang.org/x/crypto v0.6.0 // indirect
220-
golang.org/x/mod v0.8.0 // indirect
221-
golang.org/x/net v0.7.0 // indirect
222-
golang.org/x/oauth2 v0.5.0 // indirect
223-
golang.org/x/sync v0.1.0 // indirect
224-
golang.org/x/term v0.5.0 // indirect
225-
golang.org/x/text v0.7.0 // indirect
226-
golang.org/x/tools v0.6.0 // indirect
219+
golang.org/x/crypto v0.9.0 // indirect
220+
golang.org/x/mod v0.10.0 // indirect
221+
golang.org/x/net v0.10.0 // indirect
222+
golang.org/x/oauth2 v0.8.0 // indirect
223+
golang.org/x/sync v0.2.0 // indirect
224+
golang.org/x/term v0.8.0 // indirect
225+
golang.org/x/text v0.9.0 // indirect
226+
golang.org/x/tools v0.9.3 // indirect
227227
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
228228
google.golang.org/api v0.103.0 // indirect
229229
google.golang.org/appengine v1.6.7 // indirect
@@ -235,27 +235,27 @@ require (
235235
gopkg.in/warnings.v0 v0.1.2 // indirect
236236
gopkg.in/yaml.v2 v2.4.0 // indirect
237237
gopkg.in/yaml.v3 v3.0.1 // indirect
238-
k8s.io/apiextensions-apiserver v0.26.0 // indirect
239-
k8s.io/cloud-provider v0.26.0 // indirect
240-
k8s.io/cluster-bootstrap v0.26.0 // indirect
241-
k8s.io/component-base v0.26.0 // indirect
242-
k8s.io/component-helpers v0.26.0 // indirect
243-
k8s.io/cri-api v0.26.0 // indirect
244-
k8s.io/csi-translation-lib v0.26.0 // indirect
238+
k8s.io/apiextensions-apiserver v0.26.6 // indirect
239+
k8s.io/cloud-provider v0.26.6 // indirect
240+
k8s.io/cluster-bootstrap v0.26.6 // indirect
241+
k8s.io/component-base v0.26.6 // indirect
242+
k8s.io/component-helpers v0.26.6 // indirect
243+
k8s.io/cri-api v0.26.6 // indirect
244+
k8s.io/csi-translation-lib v0.26.6 // indirect
245245
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
246-
k8s.io/kms v0.26.0 // indirect
246+
k8s.io/kms v0.26.6 // indirect
247247
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
248-
k8s.io/kube-proxy v0.26.0 // indirect
248+
k8s.io/kube-proxy v0.26.6 // indirect
249249
k8s.io/kube-scheduler v0.0.0 // indirect
250250
k8s.io/kubectl v0.0.0 // indirect
251-
k8s.io/kubelet v0.26.0 // indirect
251+
k8s.io/kubelet v0.26.6 // indirect
252252
k8s.io/legacy-cloud-providers v0.0.0 // indirect
253253
k8s.io/mount-utils v0.0.0 // indirect
254254
kubevirt.io/api v0.58.0 // indirect
255255
kubevirt.io/containerized-data-importer-api v1.55.2 // indirect
256256
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
257257
moul.io/http2curl v1.0.0 // indirect
258-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
258+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
259259
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
260260
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
261261
sigs.k8s.io/yaml v1.3.0 // indirect
@@ -270,31 +270,31 @@ replace (
270270
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20221208095821-f8830e1998e8
271271
github.com/vishvananda/netlink => github.com/kubeovn/netlink v0.0.0-20230322092337-960188369daf
272272
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 => github.com/k8snetworkplumbingwg/multus-cni v0.0.0-20220818150730-3d9cec4ec9d5
273-
k8s.io/api => k8s.io/api v0.26.0
274-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
275-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
276-
k8s.io/apiserver => k8s.io/apiserver v0.26.0
277-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
278-
k8s.io/client-go => k8s.io/client-go v0.26.0
279-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
280-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
281-
k8s.io/code-generator => k8s.io/code-generator v0.26.0
282-
k8s.io/component-base => k8s.io/component-base v0.26.0
283-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
284-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
285-
k8s.io/cri-api => k8s.io/cri-api v0.26.0
286-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
287-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
288-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
289-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
290-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
291-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
292-
k8s.io/kubectl => k8s.io/kubectl v0.26.0
293-
k8s.io/kubelet => k8s.io/kubelet v0.26.0
294-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
295-
k8s.io/metrics => k8s.io/metrics v0.26.0
296-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
297-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
298-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
273+
k8s.io/api => k8s.io/api v0.26.6
274+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.6
275+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.6
276+
k8s.io/apiserver => k8s.io/apiserver v0.26.6
277+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.6
278+
k8s.io/client-go => k8s.io/client-go v0.26.6
279+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.6
280+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.6
281+
k8s.io/code-generator => k8s.io/code-generator v0.26.6
282+
k8s.io/component-base => k8s.io/component-base v0.26.6
283+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.6
284+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.6
285+
k8s.io/cri-api => k8s.io/cri-api v0.26.6
286+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.6
287+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.6
288+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.6
289+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.6
290+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.6
291+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.6
292+
k8s.io/kubectl => k8s.io/kubectl v0.26.6
293+
k8s.io/kubelet => k8s.io/kubelet v0.26.6
294+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.6
295+
k8s.io/metrics => k8s.io/metrics v0.26.6
296+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.6
297+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.6
298+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.6
299299
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20221209084839-9c2ed1f0604d
300300
)

0 commit comments

Comments
 (0)