Skip to content

Commit

Permalink
fix: vsphere image repo
Browse files Browse the repository at this point in the history
The old repository has been deleted. This means the driver is currently
not possible to deploy, and even currently running clusters fail after a
restart as the DeameonSet has an ImagePullPolicy of Always. See:
kubernetes-sigs/vsphere-csi-driver#3053

As of writing, only 3.1.2 to 3.3.1 is available in this registry. This
"officially" supports Kubernetes 1.26 to 1.30. Since older drivers are
not available, I removed some feature-gating for those unavailable
versions.
  • Loading branch information
luringens committed Sep 23, 2024
1 parent e9d406e commit ea83808
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 14 deletions.
8 changes: 4 additions & 4 deletions inventory/sample/group_vars/all/vsphere.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
## Tags for the external vSphere Cloud Provider images
## gcr.io/cloud-provider-vsphere/cpi/release/manager
# external_vsphere_cloud_controller_image_tag: "latest"
## gcr.io/cloud-provider-vsphere/csi/release/syncer
# vsphere_syncer_image_tag: "v2.5.1"
## registry.k8s.io/csi-vsphere/syncer
# vsphere_syncer_image_tag: "v3.1.1"
## registry.k8s.io/sig-storage/csi-attacher
# vsphere_csi_attacher_image_tag: "v3.4.0"
## gcr.io/cloud-provider-vsphere/csi/release/driver
# vsphere_csi_controller: "v2.5.1"
## registry.k8s.io/csi-vsphere/driver
# vsphere_csi_controller: "v3.1.1"
## registry.k8s.io/sig-storage/livenessprobe
# vsphere_csi_liveness_probe_image_tag: "v2.6.0"
## registry.k8s.io/sig-storage/csi-provisioner
Expand Down
6 changes: 3 additions & 3 deletions roles/kubernetes-apps/csi_driver/vsphere/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ external_vsphere_insecure: "true"
external_vsphere_kubernetes_cluster_id: "kubernetes-cluster-id"
external_vsphere_version: "7.0u1"

vsphere_syncer_image_tag: "v3.1.0"
vsphere_syncer_image_tag: "v3.1.1"
vsphere_csi_attacher_image_tag: "v4.3.0"
vsphere_csi_controller: "v3.1.0"
vsphere_csi_controller: "v3.1.1"
vsphere_csi_liveness_probe_image_tag: "v2.10.0"
vsphere_csi_provisioner_image_tag: "v3.5.0"
vsphere_csi_snapshotter_image_tag: "v6.2.2"
vsphere_csi_node_driver_registrar_image_tag: "v2.8.0"
vsphere_csi_driver_image_tag: "v3.1.0"
vsphere_csi_driver_image_tag: "v3.1.1"
vsphere_csi_resizer_tag: "v1.8.0"

# Set to kube-system for backward compatibility, should be change to vmware-system-csi on the long run
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ data:
"multi-vcenter-csi-topology": "true"
"csi-internal-generated-cluster-id": "true"
"listview-tasks": "true"
{% if vsphere_csi_controller is version('v2.7.0', '>=') %}
"improved-csi-idempotency": "true"
"improved-volume-topology": "true"
"use-csinode-id": "true"
"list-volumes": "false"
{% endif %}
kind: ConfigMap
metadata:
name: internal-feature-states.csi.vsphere.vmware.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
name: socket-dir
{% endif %}
- name: vsphere-csi-controller
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_controller }}
image: registry.k8s.io/csi-vsphere/driver:{{ vsphere_csi_controller }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace={{ vsphere_csi_namespace }}"
Expand Down Expand Up @@ -168,7 +168,7 @@ spec:
- name: socket-dir
mountPath: {{ csi_endpoint }}
- name: vsphere-syncer
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/syncer:{{ vsphere_syncer_image_tag }}
image: registry.k8s.io/csi-vsphere/syncer:{{ vsphere_syncer_image_tag }}
args:
- "--leader-election"
- "--leader-election-lease-duration=30s"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ rules:
- apiGroups: [""]
resources: ["events"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
{% if vsphere_csi_controller is version('v2.0.0', '>=') %}
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["get", "watch", "list", "delete", "update", "create"]
{% endif %}
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses","csinodes"]
verbs: ["get", "list", "watch"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
- --mode=kubelet-registration-probe
initialDelaySeconds: 3
- name: vsphere-csi-node
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_driver_image_tag }}
image: registry.k8s.io/csi-vsphere/driver:{{ vsphere_csi_driver_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
Expand Down

0 comments on commit ea83808

Please sign in to comment.