diff --git a/Tiltfile b/Tiltfile index 19214230..9e3abd28 100644 --- a/Tiltfile +++ b/Tiltfile @@ -21,7 +21,7 @@ settings = { "kind_cluster_name": "capoci", "capi_version": "v1.1.4", "cert_manager_version": "v1.1.0", - "kubernetes_version": "v1.23.8", + "kubernetes_version": "v1.24.3", } # global settings diff --git a/templates/cluster-template-oci-addons.yaml b/templates/cluster-template-oci-addons.yaml index 8c74be21..486a02c8 100644 --- a/templates/cluster-template-oci-addons.yaml +++ b/templates/cluster-template-oci-addons.yaml @@ -231,12 +231,12 @@ data: path: /etc/kubernetes containers: - name: oci-cloud-controller-manager - image: ghcr.io/oracle/cloud-provider-oci:v1.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 command: ["/usr/local/bin/oci-cloud-controller-manager"] args: - --cloud-config=/etc/oci/cloud-provider.yaml - --cloud-provider=oci - - --leader-elect-resource-lock=configmaps + - --leader-elect-resource-lock=configmapsleases - -v=2 volumeMounts: - name: cfg @@ -338,6 +338,18 @@ data: verbs: - create + - apiGroups: + - "coordination.k8s.io" + resources: + - leases + verbs: + - get + - create + - update + - delete + - patch + - watch + - apiGroups: - "" resources: @@ -448,7 +460,7 @@ data: node-role.kubernetes.io/master: "" containers: - name: csi-volume-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 + image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --volume-name-prefix=csi @@ -463,7 +475,8 @@ data: - mountPath: /var/run/shared-tmpfs name: shared-tmpfs - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v3. + 5.0 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --timeout=120s @@ -476,7 +489,7 @@ data: - mountPath: /var/run/shared-tmpfs name: shared-tmpfs - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --leader-election @@ -489,7 +502,7 @@ data: - --endpoint=unix://var/run/shared-tmpfs/csi.sock command: - /usr/local/bin/oci-csi-controller-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 imagePullPolicy: IfNotPresent volumeMounts: - name: config @@ -633,7 +646,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.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 securityContext: privileged: true volumeMounts: @@ -667,7 +680,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.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1 securityContext: privileged: true lifecycle: @@ -810,10 +823,18 @@ data: name: csi-oci apiGroup: rbac.authorization.k8s.io --- + kind: StorageClass + apiVersion: storage.k8s.io/v1 + metadata: + name: oci + provisioner: oracle.com/oci + --- apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: oci-bv + parameters: + attachment-type: "paravirtualized" provisioner: blockvolume.csi.oraclecloud.com volumeBindingMode: WaitForFirstConsumer allowVolumeExpansion: true diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index ca5c1332..ad7e3fb7 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -8,8 +8,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.2.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/core-components.yaml + - name: v1.2.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/core-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -21,8 +21,8 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.2.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/bootstrap-components.yaml + - name: v1.2.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/bootstrap-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -34,8 +34,8 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.2.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/control-plane-components.yaml + - name: v1.2.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/control-plane-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -73,7 +73,7 @@ providers: - sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml" variables: - KUBERNETES_VERSION: "v1.23.8" + KUBERNETES_VERSION: "v1.24.4" EXP_MACHINE_POOL: "true" EXP_CLUSTER_RESOURCE_SET: "true" NODE_DRAIN_TIMEOUT: "60s" diff --git a/test/e2e/data/ccm/ccm.yaml b/test/e2e/data/ccm/ccm.yaml index 462eb867..e6ff5951 100644 --- a/test/e2e/data/ccm/ccm.yaml +++ b/test/e2e/data/ccm/ccm.yaml @@ -63,12 +63,12 @@ spec: path: /etc/kubernetes containers: - name: oci-cloud-controller-manager - image: ghcr.io/oracle/cloud-provider-oci:v1.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 command: ["/usr/local/bin/oci-cloud-controller-manager"] args: - --cloud-config=/etc/oci/cloud-provider.yaml - --cloud-provider=oci - - --leader-elect-resource-lock=configmaps + - --leader-elect-resource-lock=configmapsleases - --v=2 volumeMounts: - name: cfg @@ -171,6 +171,18 @@ rules: verbs: - create + - apiGroups: + - "coordination.k8s.io" + resources: + - leases + verbs: + - get + - create + - update + - delete + - patch + - watch + - apiGroups: - "" resources: @@ -272,7 +284,7 @@ spec: node-role.kubernetes.io/control-plane: "" containers: - name: csi-volume-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 + image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --volume-name-prefix=csi @@ -287,7 +299,7 @@ spec: - mountPath: /var/run/shared-tmpfs name: shared-tmpfs - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --timeout=120s @@ -300,7 +312,7 @@ spec: - mountPath: /var/run/shared-tmpfs name: shared-tmpfs - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0 args: - --csi-address=/var/run/shared-tmpfs/csi.sock - --leader-election @@ -313,7 +325,7 @@ spec: - --endpoint=unix://var/run/shared-tmpfs/csi.sock command: - /usr/local/bin/oci-csi-controller-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 imagePullPolicy: IfNotPresent volumeMounts: - name: config @@ -457,7 +469,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.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 securityContext: privileged: true volumeMounts: @@ -491,7 +503,7 @@ spec: 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.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1 securityContext: privileged: true lifecycle: @@ -632,13 +644,29 @@ roleRef: name: csi-oci apiGroup: rbac.authorization.k8s.io --- +kind: StorageClass +apiVersion: storage.k8s.io/v1 +metadata: + name: oci +provisioner: oracle.com/oci +--- apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: oci-bv -parameters: - attachment-type: "paravirtualized" provisioner: blockvolume.csi.oraclecloud.com volumeBindingMode: WaitForFirstConsumer +allowVolumeExpansion: true +reclaimPolicy: Delete +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: oci-bv-encrypted +provisioner: blockvolume.csi.oraclecloud.com +parameters: + attachment-type: "paravirtualized" reclaimPolicy: Delete +volumeBindingMode: WaitForFirstConsumer +allowVolumeExpansion: true --- \ No newline at end of file diff --git a/test/e2e/data/infrastructure-oci/v1beta1/bases/ccm.yaml b/test/e2e/data/infrastructure-oci/v1beta1/bases/ccm.yaml index 5b169bed..3179812d 100644 --- a/test/e2e/data/infrastructure-oci/v1beta1/bases/ccm.yaml +++ b/test/e2e/data/infrastructure-oci/v1beta1/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.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 command: ["/usr/local/bin/oci-cloud-controller-manager"] args: - --cloud-config=/etc/oci/cloud-provider.yaml @@ -356,7 +356,7 @@ data: - --endpoint=unix://var/run/shared-tmpfs/csi.sock command: - /usr/local/bin/oci-csi-controller-driver - image: ghcr.io/oracle/cloud-provider-oci:v1.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 imagePullPolicy: IfNotPresent volumeMounts: - name: config @@ -500,7 +500,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.23.0 + image: ghcr.io/oracle/cloud-provider-oci:v1.24.0 securityContext: privileged: true volumeMounts: