Merge pull request #4 from isovalent/add-helm-values-override

Add helm values override file
isovalent · Jun 23, 2023 · 3275eff · 3275eff
2 parents 32dc0ed + 7f3e698
commit 3275eff
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 17 deletions.
diff --git a/locals.tf b/locals.tf
@@ -13,20 +13,23 @@
 // limitations under the License.
 
 locals {
-  provisioner_environment = merge(var.extra_provisioner_environment_variables, local.provisioner_environment_variables)     // The full set of environment variables passed to the provisioning script.
-  provisioner_environment_variables = {                                                                                     // The set of environment variables set by this module on the provisioning script.
-    CILIUM_HELM_CHART            = var.cilium_helm_chart,                                                                   // The Cilium Helm chart to deploy.
-    CILIUM_HELM_EXTRA_ARGS       = var.cilium_helm_extra_args                                                               // Extra arguments to be passed to the 'helm upgrade --install' command that installs Cilium.
-    CILIUM_HELM_RELEASE_NAME     = var.cilium_helm_release_name,                                                            // The name to use for the Cilium Helm release.
-    CILIUM_HELM_VALUES_FILE      = var.cilium_helm_values_file_path,                                                        // The path to the Helm values file to use when installing Cilium.
-    CILIUM_HELM_VERSION          = var.cilium_helm_version,                                                                 // The version of the Cilium Helm chart to deploy.
-    CILIUM_NAMESPACE             = var.cilium_namespace,                                                                    // The namespace where to deploy Cilium.
-    DEPLOY_ETCD_CLUSTER          = var.deploy_etcd_cluster                                                                  // Whether to deploy an 'etcd' cluster suitable for usage as the Cilium key-value store.
-    INSTALL_KUBE_PROMETHEUS_CRDS = true,                                                                                    // Whether to install (some of) the 'kube-prometheus' CRDs (such as 'ServiceMonitor').
-    IPSEC_KEY                    = var.ipsec_key,                                                                           // The IPsec key to be used for transparent encryption.
-    KUBECONFIG                   = var.path_to_kubeconfig_file                                                              // The path to the kubeconfig file that will be created and output.
-    PRE_CILIUM_INSTALL_SCRIPT    = var.pre_cilium_install_script != "" ? base64encode(var.pre_cilium_install_script) : ""   // The script to execute before installing Cilium.
-    POST_CILIUM_INSTALL_SCRIPT   = var.post_cilium_install_script != "" ? base64encode(var.post_cilium_install_script) : "" // The script to execute after installing Cilium.
+  provisioner_environment = merge(var.extra_provisioner_environment_variables, local.provisioner_environment_variables)         // The full set of environment variables passed to the provisioning script.
+  provisioner_environment_variables = {                                                                                         // The set of environment variables set by this module on the provisioning script.
+    CILIUM_HELM_CHART                = var.cilium_helm_chart,                                                                   // The Cilium Helm chart to deploy.
+    CILIUM_HELM_EXTRA_ARGS           = var.cilium_helm_extra_args                                                               // Extra arguments to be passed to the 'helm upgrade --install' command that installs Cilium.
+    CILIUM_HELM_RELEASE_NAME         = var.cilium_helm_release_name,                                                            // The name to use for the Cilium Helm release.
+    CILIUM_HELM_VALUES_FILE          = var.cilium_helm_values_file_path,                                                        // The path to the Helm values file to use when installing Cilium.
+    CILIUM_HELM_VALUES_OVERRIDE_FILE = var.cilium_helm_values_override_file_path,                                               // The path to the Helm values override file to use when installing Cilium.
+    CILIUM_HELM_VERSION              = var.cilium_helm_version,                                                                 // The version of the Cilium Helm chart to deploy.
+    CILIUM_NAMESPACE                 = var.cilium_namespace,                                                                    // The namespace where to deploy Cilium.
+    DEPLOY_ETCD_CLUSTER              = var.deploy_etcd_cluster                                                                  // Whether to deploy an 'etcd' cluster suitable for usage as the Cilium key-value store.
+    INSTALL_KUBE_PROMETHEUS_CRDS     = true,                                                                                    // Whether to install (some of) the 'kube-prometheus' CRDs (such as 'ServiceMonitor').
+    IPSEC_KEY                        = var.ipsec_key,                                                                           // The IPsec key to be used for transparent encryption.
+    KUBECONFIG                       = var.path_to_kubeconfig_file                                                              // The path to the kubeconfig file that will be created and output.
+    PRE_CILIUM_INSTALL_SCRIPT        = var.pre_cilium_install_script != "" ? base64encode(var.pre_cilium_install_script) : ""   // The script to execute before installing Cilium.
+    POST_CILIUM_INSTALL_SCRIPT       = var.post_cilium_install_script != "" ? base64encode(var.post_cilium_install_script) : "" // The script to execute after installing Cilium.
   }
   provisioner_path = "${abspath(path.module)}/scripts/provisioner.sh"
 }
+
+
diff --git a/scripts/provisioner.sh b/scripts/provisioner.sh
@@ -78,13 +78,27 @@ fi
 # Get the latest information about charts from the respective chart repositories.
 helm repo update
 
-# Replace variables in the values file and pipe it to 'helm upgrade --install'.
-envsubst < "${CILIUM_HELM_VALUES_FILE}" | \
+# Substitute environment variables into the Cilium Helm values file.
+envsubst < "${CILIUM_HELM_VALUES_FILE}" > tmp1 
+
+if [[ "${CILIUM_HELM_VALUES_OVERRIDE_FILE}" != "" ]];
+then
+  # Substitute environment variables into the Cilium Helm values override file.
+  envsubst < "${CILIUM_HELM_VALUES_OVERRIDE_FILE}" > tmp2
+  helm upgrade --install "${CILIUM_HELM_RELEASE_NAME}" "${CILIUM_HELM_CHART}" \
+  --version "${CILIUM_HELM_VERSION}" -n "${CILIUM_NAMESPACE}" -f tmp1 -f tmp2
+  rm -f tmp1 tmp2
+else
   helm upgrade --install "${CILIUM_HELM_RELEASE_NAME}" "${CILIUM_HELM_CHART}" \
-    --version "${CILIUM_HELM_VERSION}" -n "${CILIUM_NAMESPACE}" -f /dev/stdin ${CILIUM_HELM_EXTRA_ARGS}
+  --version "${CILIUM_HELM_VERSION}" -n "${CILIUM_NAMESPACE}" -f tmp1
+  rm -f tmp1
+fi
+
 
 # Run any post-install script we may have been provided with.
 if [[ "${POST_CILIUM_INSTALL_SCRIPT}" != "" ]];
 then
   base64 --decode <<< "${POST_CILIUM_INSTALL_SCRIPT}" | bash
 fi
+
+
diff --git a/variables.tf b/variables.tf
@@ -35,6 +35,11 @@ variable "cilium_helm_values_file_path" {
   type        = string
 }
 
+variable "cilium_helm_values_override_file_path" {
+  description = "The path to the file containing the values to use when installing Cilium. These values will override the ones in 'cilium_helm_values_file_path'."
+  type        = string
+}
+
 variable "cilium_helm_version" {
   description = "The version of the Cilium Helm chart to install."
   type        = string