From 736512bd7efc77ee5916efd6a7d5b2eb1bf9cf1c Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 23 Sep 2024 10:55:32 +0200 Subject: [PATCH 1/2] csi: use images from new location --- .../cloudprovider/csi/kustomization.yaml | 8 +- ...luster-template-external-loadbalancer.yaml | 8 +- templates/cluster-template-ignition.yaml | 8 +- templates/cluster-template-node-ipam.yaml | 8 +- templates/cluster-template-supervisor.yaml | 8 +- .../cluster-template-topology-supervisor.yaml | 8 +- templates/cluster-template-topology.yaml | 8 +- templates/cluster-template.yaml | 8 +- .../v1.8/base/cluster-template-topology.yaml | 463 ------------------ .../cluster-resource-set-csi-insecure.yaml | 27 - .../v1.8/topology/kustomization.yaml | 1 - .../v1.9/base/cluster-template.yaml | 8 +- .../topology/cluster-template-topology.yaml | 8 +- 13 files changed, 40 insertions(+), 531 deletions(-) delete mode 100644 test/e2e/data/infrastructure-vsphere-govmomi/v1.8/commons/cluster-resource-set-csi-insecure.yaml diff --git a/packaging/flavorgen/cloudprovider/csi/kustomization.yaml b/packaging/flavorgen/cloudprovider/csi/kustomization.yaml index 88a97b8d2a..65d5728b25 100644 --- a/packaging/flavorgen/cloudprovider/csi/kustomization.yaml +++ b/packaging/flavorgen/cloudprovider/csi/kustomization.yaml @@ -6,11 +6,11 @@ resources: - vsphere-csi-driver.yaml images: - name: gcr.io/cloud-provider-vsphere/csi/ci/driver - newName: gcr.io/cloud-provider-vsphere/csi/release/driver - newTag: v3.1.0 + newName: registry.k8s.io/csi-vsphere/driver + newTag: v3.1.2 - name: gcr.io/cloud-provider-vsphere/csi/ci/syncer - newName: gcr.io/cloud-provider-vsphere/csi/release/syncer - newTag: v3.1.0 + newName: registry.k8s.io/csi-vsphere/syncer + newTag: v3.1.2 patches: - patch: |- kind: Deployment diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml index 2af1979c73..1806f7a26a 100644 --- a/templates/cluster-template-external-loadbalancer.yaml +++ b/templates/cluster-template-external-loadbalancer.yaml @@ -680,7 +680,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -740,7 +740,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -876,7 +876,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1025,7 +1025,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml index 5e33101532..c15b649572 100644 --- a/templates/cluster-template-ignition.yaml +++ b/templates/cluster-template-ignition.yaml @@ -894,7 +894,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -954,7 +954,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -1090,7 +1090,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1239,7 +1239,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml index c8f64feb4b..02f95741e4 100644 --- a/templates/cluster-template-node-ipam.yaml +++ b/templates/cluster-template-node-ipam.yaml @@ -815,7 +815,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -875,7 +875,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -1011,7 +1011,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1160,7 +1160,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml index 6596840280..946ce03061 100644 --- a/templates/cluster-template-supervisor.yaml +++ b/templates/cluster-template-supervisor.yaml @@ -774,7 +774,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -834,7 +834,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -970,7 +970,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1119,7 +1119,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml index 14b9930e3c..2ee55f5b71 100644 --- a/templates/cluster-template-topology-supervisor.yaml +++ b/templates/cluster-template-topology-supervisor.yaml @@ -582,7 +582,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -642,7 +642,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -778,7 +778,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -927,7 +927,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index 72ee1f4df8..02624dcf21 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -588,7 +588,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -648,7 +648,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -784,7 +784,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -933,7 +933,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 0dd1791ea9..4ce54d0f10 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -805,7 +805,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -865,7 +865,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -1001,7 +1001,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1150,7 +1150,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml index 9379dd9215..4e39b0073d 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml @@ -103,20 +103,6 @@ spec: matchLabels: cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}' resources: - - kind: Secret - name: vsphere-csi-controller - - kind: ConfigMap - name: vsphere-csi-controller-role - - kind: ConfigMap - name: vsphere-csi-controller-binding - - kind: Secret - name: csi-vsphere-config - - kind: ConfigMap - name: csi.vsphere.vmware.com - - kind: ConfigMap - name: vsphere-csi-node - - kind: ConfigMap - name: vsphere-csi-controller - kind: Secret name: cloud-controller-manager - kind: Secret @@ -126,455 +112,6 @@ spec: --- apiVersion: v1 kind: Secret -metadata: - name: vsphere-csi-controller - namespace: '${NAMESPACE}' -stringData: - data: | - apiVersion: v1 - kind: ServiceAccount - metadata: - name: vsphere-csi-controller - namespace: kube-system -type: addons.cluster.x-k8s.io/resource-set ---- -apiVersion: v1 -data: - data: | - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRole - metadata: - name: vsphere-csi-controller-role - rules: - - apiGroups: - - storage.k8s.io - resources: - - csidrivers - verbs: - - create - - delete - - apiGroups: - - "" - resources: - - nodes - - pods - - secrets - - configmaps - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - persistentvolumes - verbs: - - get - - list - - watch - - update - - create - - delete - - patch - - apiGroups: - - storage.k8s.io - resources: - - volumeattachments - verbs: - - get - - list - - watch - - update - - patch - - apiGroups: - - storage.k8s.io - resources: - - volumeattachments/status - verbs: - - patch - - apiGroups: - - "" - resources: - - persistentvolumeclaims - verbs: - - get - - list - - watch - - update - - apiGroups: - - storage.k8s.io - resources: - - storageclasses - - csinodes - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - events - verbs: - - list - - watch - - create - - update - - patch - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - watch - - list - - delete - - update - - create - - apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshots - verbs: - - get - - list - - apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshotcontents - verbs: - - get - - list -kind: ConfigMap -metadata: - name: vsphere-csi-controller-role - namespace: '${NAMESPACE}' ---- -apiVersion: v1 -data: - data: | - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRoleBinding - metadata: - name: vsphere-csi-controller-binding - roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: vsphere-csi-controller-role - subjects: - - kind: ServiceAccount - name: vsphere-csi-controller - namespace: kube-system -kind: ConfigMap -metadata: - name: vsphere-csi-controller-binding - namespace: '${NAMESPACE}' ---- -apiVersion: v1 -kind: Secret -metadata: - name: csi-vsphere-config - namespace: '${NAMESPACE}' -stringData: - data: | - apiVersion: v1 - kind: Secret - metadata: - name: csi-vsphere-config - namespace: kube-system - stringData: - csi-vsphere.conf: |+ - [Global] - thumbprint = "${VSPHERE_TLS_THUMBPRINT}" - - [VirtualCenter "${VSPHERE_SERVER}"] - user = "${VSPHERE_USERNAME}" - password = "${VSPHERE_PASSWORD}" - datacenters = "${VSPHERE_DATACENTER}" - - [Network] - public-network = "${VSPHERE_NETWORK}" - - type: Opaque -type: addons.cluster.x-k8s.io/resource-set ---- -apiVersion: v1 -data: - data: | - apiVersion: storage.k8s.io/v1 - kind: CSIDriver - metadata: - name: csi.vsphere.vmware.com - spec: - attachRequired: true -kind: ConfigMap -metadata: - name: csi.vsphere.vmware.com - namespace: '${NAMESPACE}' ---- -apiVersion: v1 -data: - data: | - apiVersion: apps/v1 - kind: DaemonSet - metadata: - name: vsphere-csi-node - namespace: kube-system - spec: - selector: - matchLabels: - app: vsphere-csi-node - template: - metadata: - labels: - app: vsphere-csi-node - role: vsphere-csi - spec: - containers: - - args: - - --v=5 - - --csi-address=$(ADDRESS) - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - env: - - name: ADDRESS - value: /csi/csi.sock - - name: DRIVER_REG_SOCK_PATH - value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock - image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1 - lifecycle: - preStop: - exec: - command: - - /bin/sh - - -c - - rm -rf /registration/csi.vsphere.vmware.com-reg.sock /csi/csi.sock - name: node-driver-registrar - resources: {} - securityContext: - privileged: true - volumeMounts: - - mountPath: /csi - name: plugin-dir - - mountPath: /registration - name: registration-dir - - env: - - name: CSI_ENDPOINT - value: unix:///csi/csi.sock - - name: X_CSI_MODE - value: node - - name: X_CSI_SPEC_REQ_VALIDATION - value: "false" - - name: VSPHERE_CSI_CONFIG - value: /etc/cloud/csi-vsphere.conf - - name: LOGGER_LEVEL - value: PRODUCTION - - name: X_CSI_LOG_LEVEL - value: INFO - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - periodSeconds: 5 - timeoutSeconds: 3 - name: vsphere-csi-node - ports: - - containerPort: 9808 - name: healthz - protocol: TCP - resources: {} - securityContext: - allowPrivilegeEscalation: true - capabilities: - add: - - SYS_ADMIN - privileged: true - volumeMounts: - - mountPath: /etc/cloud - name: vsphere-config-volume - - mountPath: /csi - name: plugin-dir - - mountPath: /var/lib/kubelet - mountPropagation: Bidirectional - name: pods-mount-dir - - mountPath: /dev - name: device-dir - - args: - - --csi-address=/csi/csi.sock - image: quay.io/k8scsi/livenessprobe:v2.1.0 - name: liveness-probe - resources: {} - volumeMounts: - - mountPath: /csi - name: plugin-dir - dnsPolicy: Default - tolerations: - - effect: NoSchedule - operator: Exists - - effect: NoExecute - operator: Exists - volumes: - - name: vsphere-config-volume - secret: - secretName: csi-vsphere-config - - hostPath: - path: /var/lib/kubelet/plugins_registry - type: Directory - name: registration-dir - - hostPath: - path: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/ - type: DirectoryOrCreate - name: plugin-dir - - hostPath: - path: /var/lib/kubelet - type: Directory - name: pods-mount-dir - - hostPath: - path: /dev - name: device-dir - updateStrategy: - type: RollingUpdate -kind: ConfigMap -metadata: - name: vsphere-csi-node - namespace: '${NAMESPACE}' ---- -apiVersion: v1 -data: - data: | - apiVersion: apps/v1 - kind: Deployment - metadata: - name: vsphere-csi-controller - namespace: kube-system - spec: - replicas: 1 - selector: - matchLabels: - app: vsphere-csi-controller - template: - metadata: - labels: - app: vsphere-csi-controller - role: vsphere-csi - spec: - containers: - - args: - - --v=4 - - --timeout=300s - - --csi-address=$(ADDRESS) - - --leader-election - env: - - name: ADDRESS - value: /csi/csi.sock - image: quay.io/k8scsi/csi-attacher:v3.0.0 - name: csi-attacher - resources: {} - volumeMounts: - - mountPath: /csi - name: socket-dir - - env: - - name: CSI_ENDPOINT - value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock - - name: X_CSI_MODE - value: controller - - name: VSPHERE_CSI_CONFIG - value: /etc/cloud/csi-vsphere.conf - - name: LOGGER_LEVEL - value: PRODUCTION - - name: X_CSI_LOG_LEVEL - value: INFO - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - periodSeconds: 5 - timeoutSeconds: 3 - name: vsphere-csi-controller - ports: - - containerPort: 9808 - name: healthz - protocol: TCP - resources: {} - volumeMounts: - - mountPath: /etc/cloud - name: vsphere-config-volume - readOnly: true - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - - args: - - --csi-address=$(ADDRESS) - env: - - name: ADDRESS - value: /var/lib/csi/sockets/pluginproxy/csi.sock - image: quay.io/k8scsi/livenessprobe:v2.1.0 - name: liveness-probe - resources: {} - volumeMounts: - - mountPath: /var/lib/csi/sockets/pluginproxy/ - name: socket-dir - - args: - - --leader-election - env: - - name: X_CSI_FULL_SYNC_INTERVAL_MINUTES - value: "30" - - name: LOGGER_LEVEL - value: PRODUCTION - - name: VSPHERE_CSI_CONFIG - value: /etc/cloud/csi-vsphere.conf - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.1.0 - name: vsphere-syncer - resources: {} - volumeMounts: - - mountPath: /etc/cloud - name: vsphere-config-volume - readOnly: true - - args: - - --v=4 - - --timeout=300s - - --csi-address=$(ADDRESS) - - --leader-election - - --default-fstype=ext4 - env: - - name: ADDRESS - value: /csi/csi.sock - image: quay.io/k8scsi/csi-provisioner:v2.0.0 - name: csi-provisioner - resources: {} - volumeMounts: - - mountPath: /csi - name: socket-dir - dnsPolicy: Default - serviceAccountName: vsphere-csi-controller - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master - operator: Exists - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane - operator: Exists - volumes: - - name: vsphere-config-volume - secret: - secretName: csi-vsphere-config - - emptyDir: {} - name: socket-dir -kind: ConfigMap -metadata: - name: vsphere-csi-controller - namespace: '${NAMESPACE}' ---- -apiVersion: v1 -kind: Secret metadata: name: cloud-controller-manager namespace: '${NAMESPACE}' diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/commons/cluster-resource-set-csi-insecure.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/commons/cluster-resource-set-csi-insecure.yaml deleted file mode 100644 index be6ed3601b..0000000000 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/commons/cluster-resource-set-csi-insecure.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: csi-vsphere-config - namespace: '${NAMESPACE}' -stringData: - data: | - apiVersion: v1 - kind: Secret - metadata: - name: csi-vsphere-config - namespace: kube-system - stringData: - csi-vsphere.conf: |+ - [Global] - - [VirtualCenter "${VSPHERE_SERVER}"] - insecure-flag = "${VSPHERE_INSECURE_CSI}" - user = "${VSPHERE_USERNAME}" - password = "${VSPHERE_PASSWORD}" - datacenters = "${VSPHERE_DATACENTER}" - - [Network] - public-network = "${VSPHERE_NETWORK}" - - type: Opaque -type: addons.cluster.x-k8s.io/resource-set diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/topology/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/topology/kustomization.yaml index de372e3513..a1fdbd4d10 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/topology/kustomization.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/topology/kustomization.yaml @@ -6,7 +6,6 @@ resources: patchesStrategicMerge: - ../commons/cluster-resource-set-label.yaml - ../commons/cluster-network-CIDR.yaml - - ../commons/cluster-resource-set-csi-insecure.yaml patches: - target: kind: VSphereMachineTemplate diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml index d76352438e..b62b94beae 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml @@ -791,7 +791,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -851,7 +851,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -987,7 +987,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1136,7 +1136,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml index 28a5c8cdca..44dcd15f09 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml @@ -575,7 +575,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -635,7 +635,7 @@ data: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0 + image: registry.k8s.io/csi-vsphere/syncer:v3.1.2 imagePullPolicy: Always name: vsphere-syncer ports: @@ -771,7 +771,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -920,7 +920,7 @@ data: fieldPath: metadata.namespace - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES value: "1" - image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0 + image: registry.k8s.io/csi-vsphere/driver:v3.1.2 imagePullPolicy: Always livenessProbe: failureThreshold: 3 From da8e0e44e74b56beb2e6122e2b6cb65d5d76524a Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 23 Sep 2024 12:29:22 +0200 Subject: [PATCH 2/2] Fix CPI image location --- packaging/flavorgen/cloudprovider/cloud-controller-manager.go | 2 +- packaging/flavorgen/cloudprovider/cpi/cpi.yaml | 2 +- packaging/flavorgen/flavors/env/envsubts_consts.go | 2 +- templates/cluster-template-external-loadbalancer.yaml | 2 +- templates/cluster-template-ignition.yaml | 2 +- templates/cluster-template-node-ipam.yaml | 2 +- templates/cluster-template-supervisor.yaml | 2 +- templates/cluster-template-topology-supervisor.yaml | 2 +- templates/cluster-template-topology.yaml | 2 +- templates/cluster-template.yaml | 2 +- .../v1.8/base/cluster-template-topology.yaml | 2 +- .../v1.9/base/cluster-template.yaml | 2 +- .../v1.9/topology/cluster-template-topology.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packaging/flavorgen/cloudprovider/cloud-controller-manager.go b/packaging/flavorgen/cloudprovider/cloud-controller-manager.go index f8bcc34c95..ea9a94a6ff 100644 --- a/packaging/flavorgen/cloudprovider/cloud-controller-manager.go +++ b/packaging/flavorgen/cloudprovider/cloud-controller-manager.go @@ -32,7 +32,7 @@ import ( // NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager const ( - CPIControllerImageURL = "gcr.io/cloud-provider-vsphere/cpi/release/manager" + CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere" ) // CloudControllerManagerManifests returns the yaml manifests generated via diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml index d37cff00ac..f7a7809d8d 100644 --- a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml +++ b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml @@ -155,7 +155,7 @@ spec: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0 + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0 imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/packaging/flavorgen/flavors/env/envsubts_consts.go b/packaging/flavorgen/flavors/env/envsubts_consts.go index b3130e13cc..8a7d5756d3 100644 --- a/packaging/flavorgen/flavors/env/envsubts_consts.go +++ b/packaging/flavorgen/flavors/env/envsubts_consts.go @@ -21,7 +21,7 @@ const ( ClusterNameVar = "${CLUSTER_NAME}" ClusterClassNameVar = "${CLUSTER_CLASS_NAME}" ControlPlaneMachineCountVar = "${CONTROL_PLANE_MACHINE_COUNT}" - DefaultCloudProviderImage = "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1" + DefaultCloudProviderImage = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.2.1" DefaultClusterCIDR = "192.168.0.0/16" DefaultDiskGiB = 25 DefaultMemoryMiB = 8192 diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml index 1806f7a26a..03380a76e2 100644 --- a/templates/cluster-template-external-loadbalancer.yaml +++ b/templates/cluster-template-external-loadbalancer.yaml @@ -1289,7 +1289,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml index c15b649572..e2722f38ca 100644 --- a/templates/cluster-template-ignition.yaml +++ b/templates/cluster-template-ignition.yaml @@ -1503,7 +1503,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml index 02f95741e4..c5d70a0095 100644 --- a/templates/cluster-template-node-ipam.yaml +++ b/templates/cluster-template-node-ipam.yaml @@ -1424,7 +1424,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml index 946ce03061..1e01fefd00 100644 --- a/templates/cluster-template-supervisor.yaml +++ b/templates/cluster-template-supervisor.yaml @@ -1383,7 +1383,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml index 2ee55f5b71..63a03383d7 100644 --- a/templates/cluster-template-topology-supervisor.yaml +++ b/templates/cluster-template-topology-supervisor.yaml @@ -1191,7 +1191,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index 02624dcf21..e79a4d1f8e 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -1197,7 +1197,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 4ce54d0f10..24b077b4af 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -1414,7 +1414,7 @@ data: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml index 4e39b0073d..ee1622a6d0 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml @@ -332,7 +332,7 @@ data: - --v=2 - --cloud-provider=vsphere - --cloud-config=/etc/cloud/vsphere.conf - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} name: vsphere-cloud-controller-manager resources: requests: diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml index b62b94beae..6977164456 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml @@ -1441,7 +1441,7 @@ data: - --v=2 - --cloud-provider=vsphere - --cloud-config=/etc/cloud/vsphere.conf - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} name: vsphere-cloud-controller-manager resources: requests: diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml index 44dcd15f09..d89857351d 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml @@ -1225,7 +1225,7 @@ data: - --v=2 - --cloud-provider=vsphere - --cloud-config=/etc/cloud/vsphere.conf - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION} + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION} name: vsphere-cloud-controller-manager resources: requests: