feat: add kustomize helm apps plugin

saritasa-nest · Oct 18, 2024 · ca6f8c4 · ca6f8c4
1 parent 8f80f15
commit ca6f8c4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/charts/tekton-apps/Chart.yaml b/charts/tekton-apps/Chart.yaml
@@ -12,7 +12,7 @@ appVersion: "v0.29.0"
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.22
+version: 0.2.23-dev.1
 
 maintainers:
   - url: https://www.saritasa.com/

diff --git a/charts/tekton-apps/README.md b/charts/tekton-apps/README.md
@@ -31,7 +31,7 @@ saritasa-tekton-apps
 
 ## `chart.version`
 
-![Version: 0.2.22](https://img.shields.io/badge/Version-0.2.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
+![Version: 0.2.23-dev.1](https://img.shields.io/badge/Version-0.2.23--dev.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
 
 ## Maintainers
 

diff --git a/charts/tekton-apps/templates/general/argocd_applications.yaml b/charts/tekton-apps/templates/general/argocd_applications.yaml
@@ -37,6 +37,10 @@ spec:
     path: {{ $argocdSource.path | default (printf "apps/%s/manifests/%s" $component.name $projectEnvironment) }}
     repoURL: {{ $argocdSource.repoUrl | default ($project.kubernetesRepository).url }}
     targetRevision: {{ $argocdSource.targetRevision | default ($project.kubernetesRepository).branch }}
+    {{ if (ternary $argocdSource.kustomizeHelmChart false (hasKey $argocdSource "kustomizeHelmChart")) -}}
+    plugin:
+      name: kustomize-build-with-helm
+    {{- end }}
   {{ if (ternary $argocd.ignoreDeploymentReplicasDiff false (hasKey $argocd "ignoreDeploymentReplicasDiff")) }}
   ignoreDifferences:
   - group: apps

diff --git a/charts/tekton-apps/templates/general/argocd_extra_applications.yaml b/charts/tekton-apps/templates/general/argocd_extra_applications.yaml
@@ -30,6 +30,10 @@ spec:
     path: {{ $extraApp.path }}
     repoURL: {{ $extraApp.repoUrl | default ($project.kubernetesRepository).url }}
     targetRevision: {{ $extraApp.targetRevision | default ($project.kubernetesRepository).branch }}
+    {{ if (ternary $extraApp.kustomizeHelmChart false (hasKey $extraApp "kustomizeHelmChart")) -}}
+    plugin:
+      name: kustomize-build-with-helm
+    {{- end }}
   ignoreDifferences:
   - group: apps
     kind: Deployment

diff --git a/charts/tekton-apps/templates/wordpress/argocd_applications.yaml b/charts/tekton-apps/templates/wordpress/argocd_applications.yaml
@@ -275,6 +275,10 @@ spec:
 
     repoURL: {{ $argocd.source.repoUrl | default "https://charts.bitnami.com/bitnami" }}
     targetRevision: {{ $argocd.source.targetRevision | default "15.2.40" }}
+    {{ if (ternary $argocd.source.kustomizeHelmChart false (hasKey $argocd.source "kustomizeHelmChart")) -}}
+    plugin:
+      name: kustomize-build-with-helm
+    {{- end }}
 
   syncPolicy:
     automated:

diff --git a/charts/tekton-apps/values-test.yaml b/charts/tekton-apps/values-test.yaml
@@ -54,6 +54,7 @@ apps:
         path: dev/argocd/apps
         repoUrl: [email protected]:saritasa-nest/nmbl-kubernetes-aws.git
         targetRevision: feature/sync-boilerplate
+        kustomizeHelmChart: true
         argocd:
           notifications:
             annotations:
@@ -65,6 +66,8 @@ apps:
         pipeline: buildpack-django-build-pipeline
         applicationURL: https://api.proxylegalstaging.com
         argocd:
+          source:
+            kustomizeHelmChart: true
           syncWave: 210
           notifications:
             annotations:
@@ -118,6 +121,7 @@ apps:
           # ignoreDeploymentReplicasDiff: true
           source:
             targetRevision: 15.2.4
+            # kustomizeHelmChart: true
           notifications:
             annotations:
               notifications.argoproj.io/subscribe.on-sync-status-unknown.slack: project-nmbl; project-nmbl-alarms