OPS-8328 - Customize namespace labels, toggle app rendering (#118)

empathyco · Jun 22, 2023 · eb98bbd · eb98bbd
1 parent f6bf897
commit eb98bbd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/argocd-app-bootstrap/Chart.yaml b/charts/argocd-app-bootstrap/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0.0"
 description: Helm chart to automatically provision ArgoCD application and projects
 name: argocd-app-bootstrap
-version: 1.0.10
+version: 1.0.11
diff --git a/charts/argocd-app-bootstrap/templates/application.yaml b/charts/argocd-app-bootstrap/templates/application.yaml
@@ -1,6 +1,7 @@
 {{- range $projectName, $projectSettings := .Values.projects }}
 {{- range $projectSettings.applications }}
-{{- $appName := .name -}}
+{{ if (ne .enabled false) }}
+{{- $appName := .name }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -9,7 +10,7 @@ metadata:
   labels:
     {{- toYaml (merge (default (dict) .labels) (index $.Values.projects $projectName).labels) | nindent 4}}
 spec:
-  project: '{{ $projectName }}'
+  project: "{{ $projectName }}"
   syncPolicy:
     {{- if .autoSync.enabled }}
     automated:
@@ -18,7 +19,7 @@ spec:
     {{- end }}
     managedNamespaceMetadata:
       labels:
-        project: {{ $projectName }}
+        {{- toYaml (merge (default (dict) .labels) (index $.Values.projects $projectName).labels) | nindent 8}}
     syncOptions:
     - CreateNamespace=true
     retry:
@@ -50,3 +51,4 @@ spec:
 ---
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/argocd-app-bootstrap/values.yaml b/charts/argocd-app-bootstrap/values.yaml
@@ -4,8 +4,7 @@ projectsRoot: "environments/test"
 
 global:
   metadata:
-    labels:
-      app.kubernetes.io/team: not-set
+    labels: {}
     namespace: argocd
   projectSpec:
     clusterResourceWhitelist: []
@@ -14,8 +13,7 @@ global:
 
 projects:
   global-project-settings:
-    labels:
-      app.kubernetes.io/team: not-set
+    labels: {}
     projectSpec:
       clusterResourceWhitelist: []
       destinations: []
@@ -26,7 +24,7 @@ projects:
 #      - [email protected]
 #    applications:
 #      - name: app-name
-#        chart: chart-name
+#        enabled: true
 #        extraValuesFiles:
 #          - extra-values-file.yaml
 #        namespace: my-namespace