extract image variables

canonical · Jul 23, 2024 · 2dd8c9d · 2dd8c9d
1 parent 2230b98
commit 2dd8c9d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 35 deletions.
diff --git a/templates/vsphere/cluster-template.yaml b/templates/vsphere/cluster-template.yaml
@@ -776,7 +776,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+            image: ${CSI_ATTACHER_IMAGE}
             name: csi-attacher
             volumeMounts:
             - mountPath: /csi
@@ -795,7 +795,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+            image: ${CSI_RESIZER_IMAGE}
             name: csi-resizer
             volumeMounts:
             - mountPath: /csi
@@ -824,7 +824,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: ${CSI_DRIVER_IMAGE}
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -855,7 +855,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: ${CSI_LIVENESS_PROBE_IMAGE}
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi
@@ -884,7 +884,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: ${CSI_SYNCER_IMAGE}
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -913,7 +913,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+            image: ${CSI_PROVISIONER_IMAGE}
             name: csi-provisioner
             volumeMounts:
             - mountPath: /csi
@@ -931,7 +931,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+            image: ${CSI_SNAPSHOTTER_IMAGE}
             name: csi-snapshotter
             volumeMounts:
             - mountPath: /csi
@@ -979,7 +979,7 @@ data:
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
               value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
-            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+            image: ${CSI_REGISTRAR_IMAGE}
             livenessProbe:
               exec:
                 command:
@@ -1021,7 +1021,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: ${CSI_DRIVER_IMAGE}
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1057,7 +1057,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: ${CSI_LIVENESS_PROBE_IMAGE}
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi
@@ -1127,7 +1127,7 @@ data:
               value: unix://C:\\csi\\csi.sock
             - name: DRIVER_REG_SOCK_PATH
               value: C:\\var\\lib\\kubelet\\plugins\\csi.vsphere.vmware.com\\csi.sock
-            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+            image: ${CSI_REGISTRAR_IMAGE}
             livenessProbe:
               exec:
                 command:
@@ -1170,7 +1170,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: ${CSI_DRIVER_IMAGE}
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1201,7 +1201,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: ${CSI_LIVENESS_PROBE_IMAGE}
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi
@@ -1431,7 +1431,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: ${CPI_MANAGER_IMAGE}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere

diff --git a/templates/vsphere/template-variables.rc b/templates/vsphere/template-variables.rc
@@ -1,27 +1,36 @@
-# <--- Source: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/getting_started.md
-export VSPHERE_USERNAME=""                                          # The username used to access the remote vSphere endpoint
-export VSPHERE_PASSWORD=""                                          # The password used to access the remote vSphere endpoint
+# Source: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/getting_started.md
 
-export VSPHERE_SERVER="10.0.0.1"                                    # The vCenter server IP or FQDN
-export VSPHERE_DATACENTER="SDDC-Datacenter"                         # The vSphere datacenter to deploy the management cluster on
-export VSPHERE_DATASTORE="DefaultDatastore"                         # The vSphere datastore to deploy the management cluster on
-export VSPHERE_NETWORK="VM Network"                                 # The VM network to deploy the management cluster on
-export VSPHERE_RESOURCE_POOL="*/Resources"                          # The vSphere resource pool for your VMs
-export VSPHERE_FOLDER="vm"                                          # The VM folder for your VMs. Set to "" to use the root vSphere folder
-export VSPHERE_TEMPLATE="ubuntu-1804-kube-v1.17.3"                  # The VM template to use for your management cluster.
-export CONTROL_PLANE_ENDPOINT_IP="192.168.9.230"                    # the IP that kube-vip is going to use as a control plane endpoint
-export VIP_NETWORK_INTERFACE="ens192"                               # The interface that kube-vip should apply the IP to. Omit to tell kube-vip to autodetect the interface.
-export VSPHERE_TLS_THUMBPRINT="..."                                 # sha1 thumbprint of the vcenter certificate: openssl x509 -sha1 -fingerprint -in ca.crt -noout
-export EXP_CLUSTER_RESOURCE_SET="true"                              # This enables the ClusterResourceSet feature that we are using to deploy CSI
-export VSPHERE_SSH_AUTHORIZED_KEY="ssh-rsa AAAAB3N..."              # The public ssh authorized key on all machines in this cluster.
-                                                                    # Set to "" if you don't want to enable SSH, or are using another solution.
-export VSPHERE_STORAGE_POLICY=""                                    # This is the vSphere storage policy. Set it to "" if you don't want to use a storage policy.
-export "CPI_IMAGE_K8S_VERSION"="v1.30.0"                            # The version of the vSphere CPI image to be used by the CPI workloads
-# --->
+export VSPHERE_USERNAME=""                                                      # The username used to access the remote vSphere endpoint
+export VSPHERE_PASSWORD=""                                                      # The password used to access the remote vSphere endpoint
 
-export CK8S_VERSION="v1.30.0"                                       # K8s Version of the cluster
+export VSPHERE_SERVER="10.0.0.1"                                                # The vCenter server IP or FQDN
+export VSPHERE_DATACENTER="SDDC-Datacenter"                                     # The vSphere datacenter to deploy the management cluster on
+export VSPHERE_DATASTORE="DefaultDatastore"                                     # The vSphere datastore to deploy the management cluster on
+export VSPHERE_NETWORK="VM Network"                                             # The VM network to deploy the management cluster on
+export VSPHERE_RESOURCE_POOL="*/Resources"                                      # The vSphere resource pool for your VMs
+export VSPHERE_FOLDER="vm"                                                      # The VM folder for your VMs. Set to "" to use the root vSphere folder
+export VSPHERE_TEMPLATE="ubuntu-1804-kube-v1.17.3"                              # The VM template to use for your management cluster.
+export CONTROL_PLANE_ENDPOINT_IP="192.168.9.230"                                # the IP that kube-vip is going to use as a control plane endpoint
+export VIP_NETWORK_INTERFACE="ens192"                                           # The interface that kube-vip should apply the IP to. Omit to tell kube-vip to autodetect the interface.
+export VSPHERE_TLS_THUMBPRINT="..."                                             # sha1 thumbprint of the vcenter certificate: openssl x509 -sha1 -fingerprint -in ca.crt -noout
+export EXP_CLUSTER_RESOURCE_SET="true"                                          # This enables the ClusterResourceSet feature that we are using to deploy CSI
+export VSPHERE_SSH_AUTHORIZED_KEY="ssh-rsa AAAAB3N..."                          # The public ssh authorized key on all machines in this cluster.
+                                                                                # Set to "" if you don't want to enable SSH, or are using another solution.
+export VSPHERE_STORAGE_POLICY=""                                                # This is the vSphere storage policy. Set it to "" if you don't want to use a storage policy.
 
-export VSPHERE_PROXY_DISABLE="#"                                    # Set to "#" to disable, or "" to enable the proxy configuration
+export CPI_MANAGER_IMAGE="gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0"    # The version of the vSphere CPI image to be used by the CPI workloads
+export CSI_DRIVER_IMAGE="gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0"
+export CSI_SYNCER_IMAGE="gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0"
+export CSI_LIVENESS_PROBE_IMAGE="registry.k8s.io/sig-storage/livenessprobe:v2.10.0"
+export CSI_ATTACHER_IMAGE="registry.k8s.io/sig-storage/csi-attacher:v4.3.0"
+export CSI_RESIZER_IMAGE="registry.k8s.io/sig-storage/csi-resizer:v1.8.0"
+export CSI_PROVISIONER_IMAGE="registry.k8s.io/sig-storage/csi-provisioner:v3.5.0"
+export CSI_SNAPSHOTTER_IMAGE="registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2"
+export CSI_REGISTRAR_IMAGE="registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0"
+
+export CK8S_VERSION="v1.30.0"                                                   # K8s Version of the cluster
+
+export VSPHERE_PROXY_DISABLE="#"                                                # Set to "#" to disable, or "" to enable the proxy configuration
 
 export CONTROL_PLANE_MACHINE_COUNT=3
 export WORKER_MACHINE_COUNT=1