Skip to content

Commit 03d3261

Browse files
joekrjoekr
authored
Update 1.26 (#299)
* feat: Upgrade to Kubernetes 1.26
1 parent 3cab342 commit 03d3261

File tree

4 files changed

+53
-17
lines changed

4 files changed

+53
-17
lines changed

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

Lines changed: 21 additions & 6 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.25.0
237+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
238238
command: ["/usr/local/bin/oci-cloud-controller-manager"]
239239
args:
240240
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -465,7 +465,7 @@ data:
465465
node-role.kubernetes.io/control-plane: ""
466466
containers:
467467
- name: csi-volume-provisioner
468-
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
468+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
469469
args:
470470
- --csi-address=/var/run/shared-tmpfs/csi.sock
471471
- --volume-name-prefix=csi
@@ -480,7 +480,7 @@ data:
480480
- mountPath: /var/run/shared-tmpfs
481481
name: shared-tmpfs
482482
- name: csi-fss-volume-provisioner
483-
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
483+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
484484
args:
485485
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
486486
- --volume-name-prefix=csi-fss
@@ -522,7 +522,7 @@ data:
522522
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
523523
command:
524524
- /usr/local/bin/oci-csi-controller-driver
525-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
525+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
526526
imagePullPolicy: IfNotPresent
527527
volumeMounts:
528528
- name: config
@@ -673,7 +673,7 @@ data:
673673
fieldPath: spec.nodeName
674674
- name: PATH
675675
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
676-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
676+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
677677
securityContext:
678678
privileged: true
679679
volumeMounts:
@@ -835,8 +835,23 @@ data:
835835
- apiGroups: [""]
836836
resources: ["persistentvolumeclaims/status"]
837837
verbs: ["patch"]
838+
- apiGroups: [ "snapshot.storage.k8s.io" ]
839+
resources: [ "volumesnapshotclasses" ]
840+
verbs: [ "get", "list", "watch" ]
841+
- apiGroups: [ "snapshot.storage.k8s.io" ]
842+
resources: [ "volumesnapshotcontents" ]
843+
verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
844+
- apiGroups: [ "snapshot.storage.k8s.io" ]
845+
resources: [ "volumesnapshotcontents/status" ]
846+
verbs: [ "update", "patch" ]
847+
- apiGroups: [ "snapshot.storage.k8s.io" ]
848+
resources: [ "volumesnapshots" ]
849+
verbs: [ "get", "list", "watch", "update", "patch" ]
850+
- apiGroups: [ "snapshot.storage.k8s.io" ]
851+
resources: [ "volumesnapshots/status" ]
852+
verbs: [ "update", "patch" ]
838853
---
839-
854+
840855
kind: ClusterRoleBinding
841856
apiVersion: rbac.authorization.k8s.io/v1
842857
metadata:

‎test/e2e/config/e2e_conf.yaml

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

8282
variables:
83-
KUBERNETES_VERSION: "v1.25.6"
83+
KUBERNETES_VERSION: "v1.26.6"
8484
OCI_MANAGED_KUBERNETES_VERSION: "v1.25.4"
8585
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.26.2"
8686
EXP_MACHINE_POOL: "true"
@@ -92,8 +92,8 @@ variables:
9292
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
9393
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
9494
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
95-
KUBERNETES_VERSION_UPGRADE_TO: "v1.25.6"
96-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
95+
KUBERNETES_VERSION_UPGRADE_TO: "v1.26.6"
96+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.6"
9797
KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
9898
IP_FAMILY: "IPv4"
9999
CLUSTER_TOPOLOGY: "true"

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

Lines changed: 26 additions & 5 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.25.0
66+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
6767
command: ["/usr/local/bin/oci-cloud-controller-manager"]
6868
args:
6969
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -132,8 +132,6 @@ rules:
132132
- "extension-apiserver-authentication"
133133
verbs:
134134
- get
135-
- list
136-
- watch
137135

138136
- apiGroups:
139137
- ""
@@ -343,7 +341,7 @@ spec:
343341
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
344342
command:
345343
- /usr/local/bin/oci-csi-controller-driver
346-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
344+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
347345
imagePullPolicy: IfNotPresent
348346
volumeMounts:
349347
- name: config
@@ -385,6 +383,14 @@ spec:
385383
---
386384
apiVersion: storage.k8s.io/v1
387385
kind: CSIDriver
386+
metadata:
387+
name: fss.csi.oraclecloud.com
388+
spec:
389+
attachRequired: false
390+
podInfoOnMount: false
391+
---
392+
apiVersion: storage.k8s.io/v1
393+
kind: CSIDriver
388394
metadata:
389395
name: blockvolume.csi.oraclecloud.com
390396
spec:
@@ -494,7 +500,7 @@ spec:
494500
fieldPath: spec.nodeName
495501
- name: PATH
496502
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
497-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
503+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
498504
securityContext:
499505
privileged: true
500506
volumeMounts:
@@ -655,6 +661,21 @@ rules:
655661
- apiGroups: [""]
656662
resources: ["persistentvolumeclaims/status"]
657663
verbs: ["patch"]
664+
- apiGroups: [ "snapshot.storage.k8s.io" ]
665+
resources: [ "volumesnapshotclasses" ]
666+
verbs: [ "get", "list", "watch" ]
667+
- apiGroups: [ "snapshot.storage.k8s.io" ]
668+
resources: [ "volumesnapshotcontents" ]
669+
verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
670+
- apiGroups: [ "snapshot.storage.k8s.io" ]
671+
resources: [ "volumesnapshotcontents/status" ]
672+
verbs: [ "update", "patch" ]
673+
- apiGroups: [ "snapshot.storage.k8s.io" ]
674+
resources: [ "volumesnapshots" ]
675+
verbs: [ "get", "list", "watch", "update", "patch" ]
676+
- apiGroups: [ "snapshot.storage.k8s.io" ]
677+
resources: [ "volumesnapshots/status" ]
678+
verbs: [ "update", "patch" ]
658679
---
659680
kind: ClusterRoleBinding
660681
apiVersion: rbac.authorization.k8s.io/v1

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

Lines changed: 3 additions & 3 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.25.0
97+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
9898
command: ["/usr/local/bin/oci-cloud-controller-manager"]
9999
args:
100100
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -385,7 +385,7 @@ data:
385385
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
386386
command:
387387
- /usr/local/bin/oci-csi-controller-driver
388-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
388+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
389389
imagePullPolicy: IfNotPresent
390390
volumeMounts:
391391
- name: config
@@ -536,7 +536,7 @@ data:
536536
fieldPath: spec.nodeName
537537
- name: PATH
538538
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
539-
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
539+
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
540540
securityContext:
541541
privileged: true
542542
volumeMounts:

0 commit comments

Comments
 (0)