Add argo_spec variable

Update internal argocd helm chart implementation

Author: dojci

README.md

@@ -64,6 +64,7 @@ No modules.
 | [aws_iam_policy_document.lb_controller](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [aws_iam_policy_document.lb_controller_assume](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [utils_deep_merge_yaml.argo_application_values](https://registry.terraform.io/providers/cloudposse/utils/latest/docs/data-sources/deep_merge_yaml) | data source |
+| [utils_deep_merge_yaml.argo_spec](https://registry.terraform.io/providers/cloudposse/utils/latest/docs/data-sources/deep_merge_yaml) | data source |
 | [utils_deep_merge_yaml.values](https://registry.terraform.io/providers/cloudposse/utils/latest/docs/data-sources/deep_merge_yaml) | data source |
 
 ## Inputs
@@ -80,6 +81,7 @@ No modules.
 | <a name="input_argo_info"></a> [argo\_info](#input\_argo\_info) | ArgoCD info manifest parameter | `list` | <pre>[<br>  {<br>    "name": "terraform",<br>    "value": "true"<br>  }<br>]</pre> | no |
 | <a name="input_argo_namespace"></a> [argo\_namespace](#input\_argo\_namespace) | Namespace to deploy ArgoCD application CRD to | `string` | `"argo"` | no |
 | <a name="input_argo_project"></a> [argo\_project](#input\_argo\_project) | ArgoCD Application project | `string` | `"default"` | no |
+| <a name="input_argo_spec"></a> [argo\_spec](#input\_argo\_spec) | ArgoCD additional spec configuration | `map` | `{}` | no |
 | <a name="input_argo_sync_policy"></a> [argo\_sync\_policy](#input\_argo\_sync\_policy) | ArgoCD syncPolicy manifest parameter | `map` | `{}` | no |
 | <a name="input_enabled"></a> [enabled](#input\_enabled) | Variable indicating whether deployment is enabled | `bool` | `true` | no |
 | <a name="input_helm_chart_name"></a> [helm\_chart\_name](#input\_helm\_chart\_name) | Helm chart name to be installed | `string` | `"aws-load-balancer-controller"` | no |

argo.tf

@@ -23,8 +23,12 @@ locals {
 data "utils_deep_merge_yaml" "argo_application_values" {
   count = var.enabled && var.argo_application_enabled && var.argo_application_use_helm ? 1 : 0
   input = compact([
-    yamlencode(local.argo_application_values),
-    var.argo_application_values
+    yamlencode({
+      "spec" : local.argo_application_values
+    }),
+    yamlencode({
+      "spec" : yamldecode(var.argo_application_values)
+    })
   ])
 }
 
@@ -40,6 +44,13 @@ resource "helm_release" "argocd_application" {
   ]
 }
 
+data "utils_deep_merge_yaml" "argo_spec" {
+  count = var.enabled && var.argo_application_enabled && !var.argo_application_use_helm ? 1 : 0
+  input = compact([
+    yamlencode(local.argo_application_values),
+    yamlencode(var.argo_spec)
+  ])
+}
 
 resource "kubernetes_manifest" "self" {
   count = var.enabled && var.argo_application_enabled && !var.argo_application_use_helm ? 1 : 0
@@ -50,6 +61,6 @@ resource "kubernetes_manifest" "self" {
       "name"      = var.helm_release_name
       "namespace" = var.argo_namespace
     }
-    "spec" = local.argo_application_values
+    "spec" = yamldecode(data.utils_deep_merge_yaml.argo_spec[0].output)
   }
 }

helm/argocd-application/templates/application.yaml

@@ -5,20 +5,4 @@ metadata:
   labels:
     {{- include "argocd_application.labels" . | nindent 4 }}
 spec:
-  project: {{ .Values.project }}
-  {{ with .Values.source }}
-  source:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{ with .Values.destination }}
-  destination:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{ with .Values.syncPolicy }}
-  syncPolicy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{ with .Values.info }}
-  info:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+  {{ toYaml .Values.spec | nindent 2 }}

variables.tf

@@ -127,6 +127,11 @@ variable "argo_info" {
 }
 
 variable "argo_sync_policy" {
+  default     = {}
   description = "ArgoCD syncPolicy manifest parameter"
+}
+
+variable "argo_spec" {
   default     = {}
+  description = "ArgoCD additional spec configuration"
 }