Merge pull request kubernetes-sigs#316 from andrewsykim/clusterctl-te…

…mplatize-k8s-version clusterctl: templatize kubernetes version
jayunit100 · Jun 19, 2019 · d15cfe3 · d15cfe3
2 parents ed1f6b6 + 5954b27
commit d15cfe3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cmd/clusterctl/examples/vsphere/generate-yaml.sh b/cmd/clusterctl/examples/vsphere/generate-yaml.sh
@@ -115,6 +115,11 @@ export VSPHERE_TEMPLATE=${VSPHERE_TEMPLATE:-}
 export VSPHERE_DISK=${VSPHERE_DISK:-}
 export VSPHERE_DISK_SIZE_GB=${VSPHERE_DISK_SIZE_GB:-20}
 
+# TODO: check if KUBERNETES_VERSION has format "v1.13.6" and
+# trim the "v" from the version. Alternatively, have CAPV or CAPI
+# handle both 1.13.6 and v1.13.6
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.13.6}
+
 # validate all required variables before generating any files
 if [ ! "${CAPV_YAML_VALIDATION:-1}" = "0" ]; then
   if [ -z "${VSPHERE_USER}" ]; then

diff --git a/cmd/clusterctl/examples/vsphere/machines.yaml.template b/cmd/clusterctl/examples/vsphere/machines.yaml.template
@@ -30,7 +30,7 @@ items:
               diskSizeGB: ${VSPHERE_DISK_SIZE_GB}
             preloaded: false
       versions:
-        kubelet: 1.11.3
-        controlPlane: 1.11.3
+        kubelet: ${KUBERNETES_VERSION}
+        controlPlane: ${KUBERNETES_VERSION}
       roles:
       - Master
diff --git a/cmd/clusterctl/examples/vsphere/machineset.yaml.template b/cmd/clusterctl/examples/vsphere/machineset.yaml.template
@@ -35,6 +35,6 @@ spec:
               diskSizeGB: ${VSPHERE_DISK_SIZE_GB}
             preloaded: false
       versions:
-        kubelet: 1.11.3
+        kubelet: ${KUBERNETES_VERSION}
       roles:
       - Node