Split fluxcd and helm operator to separate resources

Author: jakubigla

main.tf

@@ -20,12 +20,14 @@ resource "kubernetes_namespace" "fluxcd" {
   metadata {
     name = "fluxcd"
   }
+
+  count = var.namespace == "" ? 1 : 0
 }
 
 resource "kubernetes_secret" "flux_ssh" {
   metadata {
     name      = "flux-ssh"
-    namespace = kubernetes_namespace.fluxcd.metadata.0.name
+    namespace = local.flux_namespace
   }
 
   data = {
@@ -40,25 +42,65 @@ resource "kubernetes_secret" "flux_ssh" {
 }
 
 locals {
-  flux_install_script      = "${path.module}/scripts/flux-install.sh"
-  flux_install_environment = {
-    KUBECONFIG                        = var.kubeconfig_filename
-    FLUX_CHART_VERSION                = var.flux_chart_version
-    FLUX_YAML_VALUES                  = yamlencode(local.flux_values)
-    FLUX_YAML_CUSTOM_VALUES           = yamlencode(var.flux_values)
-    HELM_OPERATOR_CHART_VERSION       = var.helm_operator_chart_version
-    HELM_OPERATOR_YAML_VALUES         = yamlencode(local.helm_operator_values)
-    HELM_OPERATOR_YAML_CUSTOM_VALUES  = yamlencode(var.helm_operator_values)
+  helm_install_script = "${path.module}/scripts/helm-install.sh"
+  flux_namespace      = coalesce(var.namespace, concat(kubernetes_namespace.fluxcd.*.metadata.0.name, [""])[0])
+
+  flux_environment = {
+    KUBECONFIG         = var.kubeconfig_filename
+    NAMESPACE          = local.flux_namespace
+    CHART_NAME         = "fluxcd/flux"
+    CHART_VERSION      = var.flux_chart_version
+    RELEASE_NAME       = "flux"
+    YAML_VALUES        = yamlencode(local.flux_values)
+    YAML_CUSTOM_VALUES = yamlencode(var.flux_values)
+  }
+  helm_operator_environment = {
+    KUBECONFIG         = var.kubeconfig_filename
+    NAMESPACE          = local.flux_namespace
+    CHART_NAME         = "fluxcd/helm-operator"
+    CHART_VERSION      = var.helm_operator_chart_version
+    RELEASE_NAME       = "helm-operator"
+    YAML_VALUES        = yamlencode(local.helm_operator_values)
+    YAML_CUSTOM_VALUES = yamlencode(var.helm_operator_values)
   }
 }
 
-resource "null_resource" "flux_install" {
+resource "null_resource" "flux" {
 
   provisioner "local-exec" {
     on_failure  = fail
-    command     = local.flux_install_script
-    environment = local.flux_install_environment
+    command     = local.helm_install_script
+    environment = local.flux_environment
+  }
+
+  provisioner "local-exec" {
+    command     = "helm delete flux --namespace ${local.flux_namespace}"
+    environment = local.flux_environment
+    when        = destroy
+  }
+
+  triggers = local.flux_environment
+}
+
+resource "null_resource" "helm_operator" {
+
+  provisioner "local-exec" {
+    on_failure  = fail
+    command     = local.helm_install_script
+    environment = local.helm_operator_environment
+  }
+
+  provisioner "local-exec" {
+    command     = "helm delete helm-operator --namespace ${local.flux_namespace}"
+    environment = local.helm_operator_environment
+    when        = destroy
+  }
+
+  provisioner "local-exec" {
+    command     = "kubectl delete -f https://raw.githubusercontent.com/fluxcd/helm-operator/master/deploy/flux-helm-release-crd.yaml"
+    environment = local.helm_operator_environment
+    when        = destroy
   }
 
-  triggers = local.flux_install_environment
+  triggers = local.helm_operator_environment
 }

scripts/flux-destroy.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+helm delete flux --namespace fluxcd
+helm delete helm-operator --namespace fluxcd
+
+kubectl delete -f https://raw.githubusercontent.com/fluxcd/helm-operator/master/deploy/flux-helm-release-crd.yaml

scripts/flux-install.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+VALUES_DIRECTORY=/tmp
+NAMESPACE=${NAMESPACE:-fluxcd}
+
+YAML_VALUES_FILE="${VALUES_DIRECTORY}/${RELEASE_NAME}-values.yaml"
+YAML_CUSTOM_VALUES_FILE="${VALUES_DIRECTORY}/${RELEASE_NAME}-custom-values.yaml"
+echo "${YAML_VALUES}" > "${YAML_VALUES_FILE}"
+echo "${YAML_CUSTOM_VALUES}" > "${YAML_CUSTOM_VALUES_FILE}"
+
+helm repo add fluxcd https://charts.fluxcd.io
+
+helm upgrade -i "${RELEASE_NAME}" "${CHART_NAME}" \
+  --wait \
+  --namespace "${NAMESPACE}" \
+  --version "${CHART_VERSION}" \
+  --values "${YAML_VALUES_FILE}" \
+  --values "${YAML_CUSTOM_VALUES_FILE}"
+
+rm -f \
+  "${YAML_VALUES_FILE}" \
+  "${YAML_CUSTOM_VALUES_FILE}"

scripts/helm-install.sh

@@ -3,6 +3,12 @@ variable "kubeconfig_filename" {
   description = "Path to kubeconfig"
 }
 
+variable "namespace" {
+  type        = string
+  description = "Name of the namespace where releases will be deployed. If emptu, the module will attempt to create the namespace"
+  default     = ""
+}
+
 variable "flux_chart_version" {
   type        = string
   description = "Flux chart version"