From b7b3aa83ed1b2daf0f3bf2dea1814a8313fffd60 Mon Sep 17 00:00:00 2001
From: John Costa <john.costa@gmail.com>
Date: Sat, 16 Dec 2023 07:37:04 -0500
Subject: [PATCH] Remove cluster-addons

---
 README.md                           |  7 ----
 main.tf                             | 18 ---------
 modules/cluster-addons/argo.tf      | 60 -----------------------------
 modules/cluster-addons/main.tf      | 19 ---------
 modules/cluster-addons/outputs.tf   |  3 --
 modules/cluster-addons/variables.tf | 29 --------------
 provider.tf                         | 28 --------------
 7 files changed, 164 deletions(-)
 delete mode 100644 modules/cluster-addons/argo.tf
 delete mode 100644 modules/cluster-addons/main.tf
 delete mode 100644 modules/cluster-addons/outputs.tf
 delete mode 100644 modules/cluster-addons/variables.tf

diff --git a/README.md b/README.md
index 0953c64..a440ba5 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,5 @@ module "k8s" {
   # writes the kubeconfig to the local filesystem
   path_to_kubeconfig         = "/full/path/to/.kube"
   use_cluster_name_in_config = true
-
-  cluster_addons = {
-    argo = {
-      enabled = true
-      chart_version = "5.51.6"
-    }
-  }
 }
 ```
diff --git a/main.tf b/main.tf
index 4f5877f..d35b028 100644
--- a/main.tf
+++ b/main.tf
@@ -52,21 +52,3 @@ resource "local_sensitive_file" "kubeconfig" {
     digitalocean_kubernetes_cluster.this
   ]
 }
-
-module "cluster_addons" {
-  source = "./modules/cluster-addons"
-
-  # The module must be dependant on the kubeconfig creation. We pass these values to the module
-  # so that it can use them to configure the cluster addons
-  full_path_to_kubeconfig = local_sensitive_file.kubeconfig[0].filename
-  cluster_id              = digitalocean_kubernetes_cluster.this.id
-
-  # Cluster Addons Configuration
-  cluster_addons = var.cluster_addons
-
-  providers = {
-    kubernetes = kubernetes.default
-    helm       = helm.default
-    null       = null.default
-  }
-}
diff --git a/modules/cluster-addons/argo.tf b/modules/cluster-addons/argo.tf
deleted file mode 100644
index 3b49d10..0000000
--- a/modules/cluster-addons/argo.tf
+++ /dev/null
@@ -1,60 +0,0 @@
-locals {
-  argo_config        = lookup(var.cluster_addons, "argo", { enabled = false, chart_version = null })
-  argo_enabled       = local.argo_config != null ? lookup(local.argo_config, "enabled", false) : false
-  argo_chart_version = local.argo_config != null ? lookup(local.argo_config, "chart_version", null) : null
-  namespace          = "argo"
-}
-
-resource "null_resource" "kubeconfig" {
-  count = local.argo_enabled ? 1 : 0
-
-  provisioner "local-exec" {
-    command = "until [ -f ${var.full_path_to_kubeconfig} ]; do sleep 0.5; done"
-  }
-}
-
-resource "null_resource" "kubectl_get_all" {
-  count = local.argo_enabled ? 1 : 0
-
-  provisioner "local-exec" {
-    command = "kubectl get all -A; while [ $? -ne 0 ]; do kubectl get all -A; done"
-  }
-
-  depends_on = [
-    null_resource.kubeconfig
-  ]
-}
-
-resource "kubernetes_namespace" "argo" {
-  count = local.argo_enabled ? 1 : 0
-
-  metadata {
-    name = local.namespace
-  }
-
-  depends_on = [
-    null_resource.kubeconfig,
-    null_resource.kubectl_get_all
-  ]
-}
-
-resource "helm_release" "argo" {
-  count = local.argo_enabled ? 1 : 0
-
-  name       = "argo"
-  namespace  = local.namespace
-  repository = "https://argoproj.github.io/argo-helm"
-  chart      = "argo-cd"
-  version    = local.argo_chart_version
-
-  set {
-    name  = "crds.install"
-    value = "true"
-  }
-
-  depends_on = [
-    kubernetes_namespace.argo,
-    null_resource.kubeconfig,
-    null_resource.kubectl_get_all
-  ]
-}
diff --git a/modules/cluster-addons/main.tf b/modules/cluster-addons/main.tf
deleted file mode 100644
index 7752cc4..0000000
--- a/modules/cluster-addons/main.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-terraform {
-  required_providers {
-    kubernetes = {
-      source                = "hashicorp/kubernetes"
-      version               = "~> 2.24.0"
-      configuration_aliases = [kubernetes]
-    }
-    helm = {
-      source                = "hashicorp/helm"
-      version               = "~> 2.12.1"
-      configuration_aliases = [helm]
-    }
-    null = {
-      source                = "hashicorp/null"
-      version               = "~> 3.2.2"
-      configuration_aliases = [null]
-    }
-  }
-}
diff --git a/modules/cluster-addons/outputs.tf b/modules/cluster-addons/outputs.tf
deleted file mode 100644
index 47e9fd3..0000000
--- a/modules/cluster-addons/outputs.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-output "cluster_id" {
-  value = var.cluster_id
-}
diff --git a/modules/cluster-addons/variables.tf b/modules/cluster-addons/variables.tf
deleted file mode 100644
index 49d8114..0000000
--- a/modules/cluster-addons/variables.tf
+++ /dev/null
@@ -1,29 +0,0 @@
-variable "full_path_to_kubeconfig" {
-  type        = string
-  description = "Full path to the kubeconfig file"
-}
-
-variable "cluster_addons" {
-  type = map(
-    object({
-      enabled       = bool
-      chart_version = string
-    })
-  )
-  description = <<EOT
-    cluster_addons = {
-      addon =  {
-        enabled = false
-        chart_version = "1.0.0"
-      }
-    }
-    EOT
-  nullable    = false
-  default     = {}
-}
-
-variable "cluster_id" {
-  type        = string
-  description = "The cluster ID"
-  nullable    = false
-}
diff --git a/provider.tf b/provider.tf
index bdbb4c5..652ff77 100644
--- a/provider.tf
+++ b/provider.tf
@@ -10,33 +10,5 @@ terraform {
       source  = "hashicorp/local"
       version = "~> 2.4.0"
     }
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = "~> 2.24.0"
-    }
-    helm = {
-      source  = "hashicorp/helm"
-      version = "~> 2.12.1"
-    }
-    null = {
-      source  = "hashicorp/null"
-      version = "~> 3.2.2"
-    }
-  }
-}
-
-provider "kubernetes" {
-  alias       = "default"
-  config_path = local_sensitive_file.kubeconfig[0].filename
-}
-
-provider "helm" {
-  alias = "default"
-  kubernetes {
-    config_path = local_sensitive_file.kubeconfig[0].filename
   }
 }
-
-provider "null" {
-  alias = "default"
-}