Skip to content

Commit 5032281

Browse files
shyamradhakrishnanshyamradhakrishnan
authored
Update to k8s 1.29 (#369)
* Add support for kubernetes v1.29
1 parent b53ef08 commit 5032281

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎templates/cluster-template-oci-addons.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ data:
234234
path: /etc/kubernetes
235235
containers:
236236
- name: oci-cloud-controller-manager
237-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
237+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
238238
command: ["/usr/local/bin/oci-cloud-controller-manager"]
239239
args:
240240
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -469,7 +469,7 @@ data:
469469
node-role.kubernetes.io/control-plane: ""
470470
containers:
471471
- name: csi-volume-provisioner
472-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
472+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
473473
args:
474474
- --csi-address=/var/run/shared-tmpfs/csi.sock
475475
- --volume-name-prefix=csi
@@ -484,7 +484,7 @@ data:
484484
- mountPath: /var/run/shared-tmpfs
485485
name: shared-tmpfs
486486
- name: csi-fss-volume-provisioner
487-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
487+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
488488
args:
489489
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
490490
- --volume-name-prefix=csi-fss
@@ -499,7 +499,7 @@ data:
499499
- mountPath: /var/run/shared-tmpfs
500500
name: shared-tmpfs
501501
- name: csi-attacher
502-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
502+
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
503503
args:
504504
- --csi-address=/var/run/shared-tmpfs/csi.sock
505505
- --timeout=120s
@@ -512,7 +512,7 @@ data:
512512
- mountPath: /var/run/shared-tmpfs
513513
name: shared-tmpfs
514514
- name: csi-resizer
515-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
515+
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
516516
args:
517517
- --csi-address=/var/run/shared-tmpfs/csi.sock
518518
- --leader-election
@@ -543,7 +543,7 @@ data:
543543
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
544544
command:
545545
- /usr/local/bin/oci-csi-controller-driver
546-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
546+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
547547
imagePullPolicy: IfNotPresent
548548
volumeMounts:
549549
- name: config
@@ -694,7 +694,7 @@ data:
694694
fieldPath: spec.nodeName
695695
- name: PATH
696696
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
697-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
697+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
698698
securityContext:
699699
privileged: true
700700
volumeMounts:

‎test/e2e/config/e2e_conf.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ providers:
8080
- sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"
8181

8282
variables:
83-
KUBERNETES_VERSION: "v1.28.7"
84-
OCI_MANAGED_KUBERNETES_VERSION: "v1.27.2"
85-
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.28.2"
83+
KUBERNETES_VERSION: "v1.29.6"
84+
OCI_MANAGED_KUBERNETES_VERSION: "v1.28.2"
85+
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.29.1"
8686
EXP_CLUSTER_RESOURCE_SET: "true"
8787
NODE_DRAIN_TIMEOUT: "60s"
8888
CI_VERSION: ""
@@ -91,8 +91,8 @@ variables:
9191
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
9292
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
9393
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
94-
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.7"
95-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.1"
94+
KUBERNETES_VERSION_UPGRADE_TO: "v1.29.6"
95+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.28.2"
9696
KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
9797
IP_FAMILY: "IPv4"
9898
CLUSTER_TOPOLOGY: "true"

‎test/e2e/data/ccm/ccm.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
path: /etc/kubernetes
6464
containers:
6565
- name: oci-cloud-controller-manager
66-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
66+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
6767
command: ["/usr/local/bin/oci-cloud-controller-manager"]
6868
args:
6969
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -288,7 +288,7 @@ spec:
288288
node-role.kubernetes.io/control-plane: ""
289289
containers:
290290
- name: csi-volume-provisioner
291-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
291+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
292292
args:
293293
- --csi-address=/var/run/shared-tmpfs/csi.sock
294294
- --volume-name-prefix=csi
@@ -303,7 +303,7 @@ spec:
303303
- mountPath: /var/run/shared-tmpfs
304304
name: shared-tmpfs
305305
- name: csi-fss-volume-provisioner
306-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
306+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
307307
args:
308308
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
309309
- --volume-name-prefix=csi-fss
@@ -318,7 +318,7 @@ spec:
318318
- mountPath: /var/run/shared-tmpfs
319319
name: shared-tmpfs
320320
- name: csi-attacher
321-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
321+
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
322322
args:
323323
- --csi-address=/var/run/shared-tmpfs/csi.sock
324324
- --timeout=120s
@@ -331,7 +331,7 @@ spec:
331331
- mountPath: /var/run/shared-tmpfs
332332
name: shared-tmpfs
333333
- name: csi-resizer
334-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
334+
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
335335
args:
336336
- --csi-address=/var/run/shared-tmpfs/csi.sock
337337
- --leader-election
@@ -362,7 +362,7 @@ spec:
362362
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
363363
command:
364364
- /usr/local/bin/oci-csi-controller-driver
365-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
365+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
366366
imagePullPolicy: IfNotPresent
367367
volumeMounts:
368368
- name: config
@@ -521,7 +521,7 @@ spec:
521521
fieldPath: spec.nodeName
522522
- name: PATH
523523
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
524-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
524+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
525525
securityContext:
526526
privileged: true
527527
volumeMounts:

‎test/e2e/data/infrastructure-oci/bases/ccm.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ data:
9494
path: /etc/kubernetes
9595
containers:
9696
- name: oci-cloud-controller-manager
97-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
97+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
9898
command: ["/usr/local/bin/oci-cloud-controller-manager"]
9999
args:
100100
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -332,7 +332,7 @@ data:
332332
node-role.kubernetes.io/control-plane: ""
333333
containers:
334334
- name: csi-volume-provisioner
335-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
335+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
336336
args:
337337
- --csi-address=/var/run/shared-tmpfs/csi.sock
338338
- --volume-name-prefix=csi
@@ -347,7 +347,7 @@ data:
347347
- mountPath: /var/run/shared-tmpfs
348348
name: shared-tmpfs
349349
- name: csi-fss-volume-provisioner
350-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
350+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
351351
args:
352352
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
353353
- --volume-name-prefix=csi-fss
@@ -362,7 +362,7 @@ data:
362362
- mountPath: /var/run/shared-tmpfs
363363
name: shared-tmpfs
364364
- name: csi-attacher
365-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
365+
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
366366
args:
367367
- --csi-address=/var/run/shared-tmpfs/csi.sock
368368
- --timeout=120s
@@ -375,7 +375,7 @@ data:
375375
- mountPath: /var/run/shared-tmpfs
376376
name: shared-tmpfs
377377
- name: csi-resizer
378-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
378+
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
379379
args:
380380
- --csi-address=/var/run/shared-tmpfs/csi.sock
381381
- --leader-election
@@ -402,7 +402,7 @@ data:
402402
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
403403
command:
404404
- /usr/local/bin/oci-csi-controller-driver
405-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
405+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
406406
imagePullPolicy: IfNotPresent
407407
volumeMounts:
408408
- name: config
@@ -553,7 +553,7 @@ data:
553553
fieldPath: spec.nodeName
554554
- name: PATH
555555
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
556-
image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
556+
image: ghcr.io/oracle/cloud-provider-oci:v1.29.0
557557
securityContext:
558558
privileged: true
559559
volumeMounts:

0 commit comments

Comments
 (0)