Upgrade to Kubernetes 1.25 (#220)

* Upgrade test and Addons template to Kubernetes 1.25
oracle · Mar 2, 2023 · 101cf16 · 101cf16
1 parent e059b84
commit 101cf16
Show file tree

Hide file tree

Showing 7 changed files with 3,188 additions and 2,441 deletions.
diff --git a/Makefile b/Makefile
@@ -259,7 +259,7 @@ generate-e2e-templates: $(KUSTOMIZE)
 .PHONY: test-e2e-run
 test-e2e-run: generate-e2e-templates $(GINKGO) $(ENVSUBST) ## Run e2e tests
 	$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
-    $(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" -skip=$(GINKGO_SKIP) -nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \
+    $(GINKGO) -v -trace -timeout=4h -tags=e2e -focus="$(GINKGO_FOCUS)" -skip=$(GINKGO_SKIP) -nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \
     	-e2e.artifacts-folder="$(ARTIFACTS)" \
     	-e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
     	-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS)

diff --git a/templates/cluster-template-oci-addons.yaml b/templates/cluster-template-oci-addons.yaml
@@ -234,13 +234,13 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
               command: ["/usr/local/bin/oci-cloud-controller-manager"]
               args:
                 - --cloud-config=/etc/oci/cloud-provider.yaml
                 - --cloud-provider=oci
-                - --leader-elect-resource-lock=configmapsleases 
-                - -v=2
+                - --leader-elect-resource-lock=configmapsleases
+                - --v=2
               volumeMounts:
                 - name: cfg
                   mountPath: /etc/oci
@@ -371,6 +371,8 @@ data:
         - "extension-apiserver-authentication"
       verbs:
         - get
+        - list
+        - watch
 
     - apiGroups:
       - ""
@@ -477,8 +479,23 @@ data:
                   readOnly: true
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
+            - name: csi-fss-volume-provisioner
+              image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+              args:
+                - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
+                - --volume-name-prefix=csi-fss
+                - --feature-gates=Topology=true
+                - --timeout=120s
+                - --leader-election
+                - --leader-election-namespace=kube-system
+              volumeMounts:
+                - name: config
+                  mountPath: /etc/oci/
+                  readOnly: true
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
             - name: csi-attacher
-              image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+              image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --timeout=120s
@@ -491,7 +508,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-resizer
-              image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
+              image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --leader-election
@@ -502,9 +519,10 @@ data:
             - name: oci-csi-controller-driver
               args:
                 - --endpoint=unix://var/run/shared-tmpfs/csi.sock
+                - --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.24.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -534,7 +552,7 @@ data:
           serviceAccountName: csi-oci-node-sa
           terminationGracePeriodSeconds: 30
           tolerations:
-            - operator: Exists 
+            - operator: Exists
     ---
     apiVersion: storage.k8s.io/v1
     kind: CSIDriver
@@ -544,6 +562,13 @@ data:
       attachRequired: false
       podInfoOnMount: false
     ---
+    apiVersion: storage.k8s.io/v1
+    kind: CSIDriver
+    metadata:
+      name: blockvolume.csi.oraclecloud.com
+    spec:
+      fsGroupPolicy: File
+    ---
     kind: ConfigMap
     apiVersion: v1
     metadata:
@@ -648,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.24.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
               securityContext:
                 privileged: true
               volumeMounts:

diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -76,9 +76,9 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml"
 
 variables:
-  KUBERNETES_VERSION: "v1.24.4"
-  OCI_MANAGED_KUBERNETES_VERSION: "v1.23.4"
-  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.24.1"
+  KUBERNETES_VERSION: "v1.25.6"
+  OCI_MANAGED_KUBERNETES_VERSION: "v1.24.1"
+  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.25.4"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   NODE_DRAIN_TIMEOUT: "60s"
@@ -88,8 +88,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.24.2"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.8"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.25.6"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
   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.24.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
           command: ["/usr/local/bin/oci-cloud-controller-manager"]
           args:
             - --cloud-config=/etc/oci/cloud-provider.yaml
@@ -132,6 +132,8 @@ rules:
       - "extension-apiserver-authentication"
     verbs:
       - get
+      - list
+      - watch
 
   - apiGroups:
       - ""
@@ -298,8 +300,23 @@ spec:
               readOnly: true
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
+        - name: csi-fss-volume-provisioner
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+          args:
+            - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
+            - --volume-name-prefix=csi-fss
+            - --feature-gates=Topology=true
+            - --timeout=120s
+            - --leader-election
+            - --leader-election-namespace=kube-system
+          volumeMounts:
+            - name: config
+              mountPath: /etc/oci/
+              readOnly: true
+            - mountPath: /var/run/shared-tmpfs
+              name: shared-tmpfs
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+          image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --timeout=120s
@@ -312,7 +329,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-resizer
-          image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
+          image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --leader-election
@@ -323,9 +340,10 @@ spec:
         - name: oci-csi-controller-driver
           args:
             - --endpoint=unix://var/run/shared-tmpfs/csi.sock
+            - --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.24.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config
@@ -365,6 +383,13 @@ spec:
   attachRequired: false
   podInfoOnMount: false
 ---
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: blockvolume.csi.oraclecloud.com
+spec:
+  fsGroupPolicy: File
+---
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -469,7 +494,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.24.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
           securityContext:
             privileged: true
           volumeMounts: