Update 1.26 (#299)

* feat: Upgrade to Kubernetes 1.26
oracle · Jul 11, 2023 · 03d3261 · 03d3261
1 parent 3cab342
commit 03d3261
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 17 deletions.
diff --git a/templates/cluster-template-oci-addons.yaml b/templates/cluster-template-oci-addons.yaml
@@ -234,7 +234,7 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               command: ["/usr/local/bin/oci-cloud-controller-manager"]
               args:
                 - --cloud-config=/etc/oci/cloud-provider.yaml
@@ -465,7 +465,7 @@ data:
             node-role.kubernetes.io/control-plane: ""
           containers:
             - name: csi-volume-provisioner
-              image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --volume-name-prefix=csi
@@ -480,7 +480,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-fss-volume-provisioner
-              image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
                 - --volume-name-prefix=csi-fss
@@ -522,7 +522,7 @@ data:
                 - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
               command:
                 - /usr/local/bin/oci-csi-controller-driver
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -673,7 +673,7 @@ data:
                       fieldPath: spec.nodeName
                 - name: PATH
                   value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               securityContext:
                 privileged: true
               volumeMounts:
@@ -835,8 +835,23 @@ data:
       - apiGroups: [""]
         resources: ["persistentvolumeclaims/status"]
         verbs: ["patch"]
+      - apiGroups: [ "snapshot.storage.k8s.io" ]
+        resources: [ "volumesnapshotclasses" ]
+        verbs: [ "get", "list", "watch" ]
+      - apiGroups: [ "snapshot.storage.k8s.io" ]
+        resources: [ "volumesnapshotcontents" ]
+        verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
+      - apiGroups: [ "snapshot.storage.k8s.io" ]
+        resources: [ "volumesnapshotcontents/status" ]
+        verbs: [ "update", "patch" ]
+      - apiGroups: [ "snapshot.storage.k8s.io" ]
+        resources: [ "volumesnapshots" ]
+        verbs: [ "get", "list", "watch", "update", "patch" ]
+      - apiGroups: [ "snapshot.storage.k8s.io" ]
+        resources: [ "volumesnapshots/status" ]
+        verbs: [ "update", "patch" ]
     ---
-    
+
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1
     metadata:

diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -80,7 +80,7 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"
 
 variables:
-  KUBERNETES_VERSION: "v1.25.6"
+  KUBERNETES_VERSION: "v1.26.6"
   OCI_MANAGED_KUBERNETES_VERSION: "v1.25.4"
   OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.26.2"
   EXP_MACHINE_POOL: "true"
@@ -92,8 +92,8 @@ variables:
   CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
   CONFORMANCE_WORKER_MACHINE_COUNT: "2"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.25.6"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.26.6"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.6"
   KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
   IP_FAMILY: "IPv4"
   CLUSTER_TOPOLOGY: "true"

diff --git a/test/e2e/data/ccm/ccm.yaml b/test/e2e/data/ccm/ccm.yaml
@@ -63,7 +63,7 @@ spec:
             path: /etc/kubernetes
       containers:
         - name: oci-cloud-controller-manager
-          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
           command: ["/usr/local/bin/oci-cloud-controller-manager"]
           args:
             - --cloud-config=/etc/oci/cloud-provider.yaml
@@ -132,8 +132,6 @@ rules:
       - "extension-apiserver-authentication"
     verbs:
       - get
-      - list
-      - watch
 
   - apiGroups:
       - ""
@@ -343,7 +341,7 @@ spec:
             - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
           command:
             - /usr/local/bin/oci-csi-controller-driver
-          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config
@@ -385,6 +383,14 @@ spec:
 ---
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
+metadata:
+  name: fss.csi.oraclecloud.com
+spec:
+  attachRequired: false
+  podInfoOnMount: false
+---
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
 metadata:
   name: blockvolume.csi.oraclecloud.com
 spec:
@@ -494,7 +500,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: PATH
               value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
           securityContext:
             privileged: true
           volumeMounts:
@@ -655,6 +661,21 @@ rules:
   - apiGroups: [""]
     resources: ["persistentvolumeclaims/status"]
     verbs: ["patch"]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotclasses" ]
+    verbs: [ "get", "list", "watch" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotcontents" ]
+    verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotcontents/status" ]
+    verbs: [ "update", "patch" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshots" ]
+    verbs: [ "get", "list", "watch", "update", "patch" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshots/status" ]
+    verbs: [ "update", "patch" ]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/test/e2e/data/infrastructure-oci/bases/ccm.yaml b/test/e2e/data/infrastructure-oci/bases/ccm.yaml
@@ -94,7 +94,7 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               command: ["/usr/local/bin/oci-cloud-controller-manager"]
               args:
                 - --cloud-config=/etc/oci/cloud-provider.yaml
@@ -385,7 +385,7 @@ data:
                 - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
               command:
                 - /usr/local/bin/oci-csi-controller-driver
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -536,7 +536,7 @@ data:
                       fieldPath: spec.nodeName
                 - name: PATH
                   value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
               securityContext:
                 privileged: true
               volumeMounts: