From b36d31da875338f11b940f943ce162c52f29048c Mon Sep 17 00:00:00 2001
From: Vignir Hafsteinsson <vignirhafsteinsson@asana.com>
Date: Mon, 15 Aug 2022 12:44:42 +0000
Subject: [PATCH 1/2] Setting type explicitly on helm values for ArgoCD helm
 release

Explicitly setting the type for values used in the Helm release for ArgoCD.
This should remove errors reported for inconsistent final plans by Terraform.
---
 modules/kubernetes-addons/argocd/main.tf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/kubernetes-addons/argocd/main.tf b/modules/kubernetes-addons/argocd/main.tf
index ce4fd44b0d..4987b04978 100644
--- a/modules/kubernetes-addons/argocd/main.tf
+++ b/modules/kubernetes-addons/argocd/main.tf
@@ -29,48 +29,56 @@ resource "helm_release" "argocd_application" {
   set {
     name  = "name"
     value = each.key
+    type  = "string"
   }
 
   set {
     name  = "project"
     value = each.value.project
+    type  = "string"
   }
 
   # Source Config.
   set {
     name  = "source.repoUrl"
     value = each.value.repo_url
+    type  = "string"
   }
 
   set {
     name  = "source.targetRevision"
     value = each.value.target_revision
+    type  = "string"
   }
 
   set {
     name  = "source.path"
     value = each.value.path
+    type  = "string"
   }
 
   set {
     name  = "source.helm.releaseName"
     value = each.key
+    type  = "string"
   }
 
   set {
-    name = "source.helm.values"
+    name  = "source.helm.values"
     value = yamlencode(merge(
       { repo_url = each.value.repo_url },
       each.value.values,
       local.global_application_values,
       each.value.add_on_application ? var.addon_config : {}
     ))
+    type  = "auto"
   }
 
   # Destination Config.
   set {
     name  = "destination.server"
     value = each.value.destination
+    type  = "string"
   }
 
   depends_on = [module.helm_addon]

From 5e9f4ec717291761db0fdc51a259b20977f145cb Mon Sep 17 00:00:00 2001
From: Vignir Hafsteinsson <vignirhafsteinsson@asana.com>
Date: Mon, 15 Aug 2022 14:22:00 +0000
Subject: [PATCH 2/2] format fix

---
 modules/kubernetes-addons/argocd/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kubernetes-addons/argocd/main.tf b/modules/kubernetes-addons/argocd/main.tf
index 4987b04978..222156c560 100644
--- a/modules/kubernetes-addons/argocd/main.tf
+++ b/modules/kubernetes-addons/argocd/main.tf
@@ -64,14 +64,14 @@ resource "helm_release" "argocd_application" {
   }
 
   set {
-    name  = "source.helm.values"
+    name = "source.helm.values"
     value = yamlencode(merge(
       { repo_url = each.value.repo_url },
       each.value.values,
       local.global_application_values,
       each.value.add_on_application ? var.addon_config : {}
     ))
-    type  = "auto"
+    type = "auto"
   }
 
   # Destination Config.