Update CAPI, CCM and golang versions (oracle#355)

* Update CAPI, CCM and golang versions

templates/cluster-template-oci-addons.yaml

@@ -219,10 +219,10 @@ data:
           - key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
             effect: NoSchedule
-          - key: node-role.kubernetes.io/master
+          - key: node-role.kubernetes.io/control-plane
             operator: Exists
             effect: NoSchedule
-          - key: node-role.kubernetes.io/control-plane
+          - key: node-role.kubernetes.io/master
             operator: Exists
             effect: NoSchedule
           volumes:
@@ -234,12 +234,13 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.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
+                - --leader-elect-resource-lock=leases
+                - --concurrent-service-syncs=3
                 - --v=2
               volumeMounts:
                 - name: cfg
@@ -284,7 +285,7 @@ data:
       - list
       - watch
       - patch
-
+      - get
     - apiGroups:
       - ""
       resources:
@@ -380,6 +381,9 @@ data:
       - serviceaccounts
       verbs:
       - create
+      - list
+      - get
+      - watch
     - apiGroups:
       - ""
       resources:
@@ -465,7 +469,7 @@ data:
             node-role.kubernetes.io/control-plane: ""
           containers:
             - name: csi-volume-provisioner
-              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --volume-name-prefix=csi
@@ -480,7 +484,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-fss-volume-provisioner
-              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
                 - --volume-name-prefix=csi-fss
@@ -495,7 +499,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-attacher
-              image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+              image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --timeout=120s
@@ -508,7 +512,24 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-resizer
-              image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+              image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
+              args:
+                - --csi-address=/var/run/shared-tmpfs/csi.sock
+                - --leader-election
+              imagePullPolicy: "IfNotPresent"
+              volumeMounts:
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
+            - name: snapshot-controller
+              image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.0
+              args:
+                - --leader-election
+              imagePullPolicy: "IfNotPresent"
+              volumeMounts:
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
+            - name: csi-snapshotter
+              image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --leader-election
@@ -522,7 +543,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.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -673,7 +694,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.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               securityContext:
                 privileged: true
               volumeMounts:
@@ -687,6 +708,7 @@ data:
                 - mountPath: /dev
                   name: device-dir
                 - mountPath: /host
+                  mountPropagation: HostToContainer
                   name: host-root
                 - mountPath: /sbin/iscsiadm
                   name: chroot-iscsiadm
@@ -707,7 +729,7 @@ data:
               args:
                 - --csi-address=/csi/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
               securityContext:
                 privileged: true
               lifecycle:
@@ -726,7 +748,7 @@ data:
               args:
                 - --csi-address=/fss/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
               securityContext:
                 privileged: true
               lifecycle:
@@ -805,65 +827,65 @@ data:
       name: csi-oci
       namespace: kube-system
     rules:
-      - apiGroups: [""]
-        resources: ["events"]
-        verbs: ["get", "list", "watch", "create", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["nodes"]
-        verbs: ["get", "list", "watch"]
-      - apiGroups: ["volume.oci.oracle.com"]
-        resources: ["blockscsiinfos"]
-        verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["persistentvolumes"]
-        verbs: ["get", "list", "watch", "create", "delete", "patch"]
-      - apiGroups: [""]
-        resources: ["persistentvolumeclaims"]
-        verbs: ["get", "list", "watch", "update", "create"]
-      - apiGroups: ["storage.k8s.io"]
-        resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
-        verbs: ["get", "list", "watch", "patch"]
-      - apiGroups: ["coordination.k8s.io"]
-        resources: ["leases"]
-        verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["endpoints"]
-        verbs: ["get", "watch", "create", "update"]
-      - apiGroups: [""]
-        resources: ["pods"]
-        verbs: ["get", "list", "watch"]
-      - 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" ]
+     - apiGroups: [""]
+       resources: ["events"]
+       verbs: ["get", "list", "watch", "create", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["nodes"]
+       verbs: ["get", "list", "watch"]
+     - apiGroups: ["volume.oci.oracle.com"]
+       resources: ["blockscsiinfos"]
+       verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["persistentvolumes"]
+       verbs: ["get", "list", "watch", "create", "delete", "patch"]
+     - apiGroups: [""]
+       resources: ["persistentvolumeclaims"]
+       verbs: ["get", "list", "watch", "update", "create"]
+     - apiGroups: ["storage.k8s.io"]
+       resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
+       verbs: ["get", "list", "watch", "patch"]
+     - apiGroups: ["coordination.k8s.io"]
+       resources: ["leases"]
+       verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["endpoints"]
+       verbs: ["get", "watch", "create", "update"]
+     - apiGroups: [""]
+       resources: ["pods"]
+       verbs: ["get", "list", "watch"]
+     - 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:
-      name: csi-oci-binding
+     name: csi-oci-binding
     subjects:
-      - kind: ServiceAccount
-        name: csi-oci-node-sa
-        namespace: kube-system
+     - kind: ServiceAccount
+       name: csi-oci-node-sa
+       namespace: kube-system
     roleRef:
-      kind: ClusterRole
-      name: csi-oci
-      apiGroup: rbac.authorization.k8s.io
+     kind: ClusterRole
+     name: csi-oci
+     apiGroup: rbac.authorization.k8s.io
     ---
     kind: StorageClass
     apiVersion: storage.k8s.io/v1

test/e2e/config/e2e_conf.yaml

@@ -8,8 +8,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.4.3
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/core-components.yaml
+      - name: v1.5.7
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/core-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -21,8 +21,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: v1.4.3
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/bootstrap-components.yaml
+      - name: v1.5.7
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/bootstrap-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -34,7 +34,7 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: v1.4.3
+      - name: v1.5.7
         value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/control-plane-components.yaml
         type: url
         files:
@@ -80,9 +80,9 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"
 
 variables:
-  KUBERNETES_VERSION: "v1.26.6"
-  OCI_MANAGED_KUBERNETES_VERSION: "v1.25.4"
-  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.26.2"
+  KUBERNETES_VERSION: "v1.28.7"
+  OCI_MANAGED_KUBERNETES_VERSION: "v1.27.2"
+  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.28.2"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   NODE_DRAIN_TIMEOUT: "60s"
@@ -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.26.6"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.6"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.28.7"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.1"
   KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
   IP_FAMILY: "IPv4"
   CLUSTER_TOPOLOGY: "true"