Unhardcode kubernetes version for k0s
Allow to pass K0S_VERSION
Related-Prod: PRODX-46480
Change-Id: Icc05e4055e4a972e328bb42b332d71de04866180
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index fd83b44..5a142cb 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -87,6 +87,9 @@
devops_utils_refspec:
type: string
default: 'master'
+ k0s_version:
+ type: string
+ default: ''
resources:
@@ -120,6 +123,7 @@
$secure_overlay_enabled: { get_param: secure_overlay_enabled }
$kubectl_version: { get_param: kubectl_version }
$devops_utils_refspec: { get_param: devops_utils_refspec }
+ $k0s_version: { get_param: k0s_version }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/scripts/functions.sh b/de/heat-templates/scripts/functions.sh
index 1283894..132d975 100644
--- a/de/heat-templates/scripts/functions.sh
+++ b/de/heat-templates/scripts/functions.sh
@@ -355,7 +355,8 @@
}
function download_k0s {
- curl -sSLf https://get.k0s.sh | sudo sh
+ curl -sSLf https://get.k0s.sh -o /tmp/get.k0s.sh
+ sh /tmp/get.k0s.sh
}
function install_k0s {
diff --git a/de/heat-templates/scripts/launch.sh b/de/heat-templates/scripts/launch.sh
index 53148b3..5a89193 100644
--- a/de/heat-templates/scripts/launch.sh
+++ b/de/heat-templates/scripts/launch.sh
@@ -56,7 +56,7 @@
KUBERNETES_CONTAINER_RUNTIME=${KUBERNETES_CONTAINER_RUNTIME:-$kubernetes_container_runtime}
DEVOPS_UTILS_REFSPEC=${DEVOPS_UTILS_REFSPEC:-$devops_utils_refspec}
-
+K0S_VERSION=${K0S_VERSION:-$k0s_version}
#
# End of block
#
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 56f939e..e09fafe 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -407,6 +407,9 @@
devops_utils_refspec:
type: string
default: 'master'
+ k0s_version:
+ type: string
+ default: ''
conditions:
aio_deploy:
@@ -570,6 +573,7 @@
secure_overlay_enabled: { get_param: secure_overlay_enabled }
kubectl_version: { get_param: kubectl_version }
devops_utils_refspec: { get_param: devops_utils_refspec }
+ k0s_version: { get_param: k0s_version }
masters:
type: OS::Heat::ResourceGroup