Repository: valiton/k8s-terraform-blueprints
Pull request #8: Addon optimizations 11042025
Author: login: mcpomm
Created: 2025-04-11T10:38:02Z | Merged: 2025-04-15T11:46:29Z



Diff:
diff --git a/argocd/addons/config/oss/argo-cd/development.yaml b/argocd/addons/config/oss/argo-cd/development.yaml
index e69de29..281c7d0 100644
--- a/argocd/addons/config/oss/argo-cd/development.yaml
+++ b/argocd/addons/config/oss/argo-cd/development.yaml
@@ -0,0 +1,3 @@
+configs:
+  cm:
+    timeout.reconciliation: 30s
diff --git a/argocd/addons/oss/addons-argo-cd-appset.yaml b/argocd/addons/oss/addons-argo-cd-appset.yaml
index 6660d30..a48eafe 100644
--- a/argocd/addons/oss/addons-argo-cd-appset.yaml
+++ b/argocd/addons/oss/addons-argo-cd-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-argocd
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -36,32 +37,31 @@ spec:
                 addonChartVersion: 7.8.13
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.oss_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.oss_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
+              {{- if .metadata.annotations.base_nodepool_labels}}
               global:
                 nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
-              configs:
-                cm:
-                  timeout.reconciliation: 20s
+                  {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
       destination:
-        namespace: '{{values.addonChartRepositoryNamespace}}'
-        name: '{{name}}'
+        namespace: '{{.values.addonChartRepositoryNamespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated:
           prune: false
diff --git a/argocd/addons/oss/addons-kube-prometheus-stack-appset.yaml b/argocd/addons/oss/addons-kube-prometheus-stack-appset.yaml
index c261b8d..d09d79d 100644
--- a/argocd/addons/oss/addons-kube-prometheus-stack-appset.yaml
+++ b/argocd/addons/oss/addons-kube-prometheus-stack-appset.yaml
@@ -49,7 +49,7 @@ spec:
             releaseName: '{{values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
+              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/values.yaml
               - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
       destination:
         namespace: '{{values.addonChart}}'
diff --git a/argocd/addons/oss/addons-metrics-server-appset.yaml b/argocd/addons/oss/addons-metrics-server-appset.yaml
index 9e74026..49884b1 100644
--- a/argocd/addons/oss/addons-metrics-server-appset.yaml
+++ b/argocd/addons/oss/addons-metrics-server-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-metrics-server
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -36,28 +37,30 @@ spec:
                 addonChartVersion: 3.12.0
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.oss_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.oss_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.oss_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              nodeSelector: 
-                {{metadata.annotations.base_nodepool_labels}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
+              nodeSelector:
+                {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
       destination:
-        namespace: '{{values.addonChartNamespace}}'
-        name: '{{name}}'
+        namespace: '{{.values.addonChartNamespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated: {}
         syncOptions:
diff --git a/argocd/addons/vendors/aws/addons-aws-csi-ebs-resources-appset.yaml b/argocd/addons/vendors/aws/addons-aws-csi-ebs-resources-appset.yaml
index 9d5bde6..f9d9b3c 100644
--- a/argocd/addons/vendors/aws/addons-aws-csi-ebs-resources-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-csi-ebs-resources-appset.yaml
@@ -49,7 +49,7 @@ spec:
             releaseName: '{{values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
+              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/values.yaml
               - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
       destination:
         name: '{{name}}'
diff --git a/argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml b/argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml
index 1c78766..124f337 100644
--- a/argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-aws-efs-csi-driver
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -35,38 +36,40 @@ spec:
                 addonChartVersion: 3.1.5
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
+              {{- if .metadata.annotations.base_nodepool_labels}}
               controller:
                 nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
-                serviceAccount:
-                  name: {{metadata.annotations.aws_efs_csi_driver_controller_service_account}}
-                  annotations:
-                    eks.amazonaws.com/role-arn: {{metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
+                  {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
+              serviceAccount:
+                name: {{.metadata.annotations.aws_efs_csi_driver_controller_service_account}}
+                annotations:
+                  eks.amazonaws.com/role-arn: {{.metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
               node:
                 serviceAccount:
-                  name: {{metadata.annotations.aws_efs_csi_driver_node_service_account}}
+                  name: {{.metadata.annotations.aws_efs_csi_driver_node_service_account}}
                   annotations:
-                    eks.amazonaws.com/role-arn: {{metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
+                    eks.amazonaws.com/role-arn: {{.metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
       destination:
-        namespace: '{{metadata.annotations.aws_efs_csi_driver_namespace}}'
-        name: '{{name}}'
+        namespace: '{{.metadata.annotations.aws_efs_csi_driver_namespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated: {}
         syncOptions:
diff --git a/argocd/addons/vendors/aws/addons-aws-load-balancer-controller-appset.yaml b/argocd/addons/vendors/aws/addons-aws-load-balancer-controller-appset.yaml
index e494b4b..c31acbe 100644
--- a/argocd/addons/vendors/aws/addons-aws-load-balancer-controller-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-load-balancer-controller-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-aws-load-balancer-controller
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -35,34 +36,36 @@ spec:
                 addonChartVersion: 1.11.0
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              nodeSelector: 
-                {{metadata.annotations.base_nodepool_labels}}
-              vpcId: '{{metadata.annotations.aws_vpc_id}}'
-              clusterName: {{metadata.annotations.aws_cluster_name}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
+              nodeSelector:
+                {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
+              vpcId: '{{.metadata.annotations.aws_vpc_id}}'
+              clusterName: {{.metadata.annotations.aws_cluster_name}}
               serviceAccount:
-                name: {{metadata.annotations.aws_load_balancer_controller_service_account}}
+                name: {{.metadata.annotations.aws_load_balancer_controller_service_account}}
                 annotations:
-                  eks.amazonaws.com/role-arn: {{metadata.annotations.aws_load_balancer_controller_iam_role_arn}}
+                  eks.amazonaws.com/role-arn: {{.metadata.annotations.aws_load_balancer_controller_iam_role_arn}}
       destination:
-        namespace: '{{metadata.annotations.aws_load_balancer_controller_namespace}}'
-        name: '{{name}}'
+        namespace: '{{.metadata.annotations.aws_load_balancer_controller_namespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated: {}
         syncOptions:
diff --git a/argocd/addons/vendors/aws/addons-aws-oss-external-dns-appset.yaml b/argocd/addons/vendors/aws/addons-aws-oss-external-dns-appset.yaml
index 75d64a9..06d0168 100644
--- a/argocd/addons/vendors/aws/addons-aws-oss-external-dns-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-oss-external-dns-appset.yaml
@@ -50,12 +50,14 @@ spec:
             releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
               - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
               provider: aws
-              nodeSelector: 
-                {{ .metadata.annotations.base_nodepool_labels | indent 2 }}
+              {{- if .metadata.annotations.base_nodepool_labels}}
+              nodeSelector:
+                {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
               serviceAccount:
                 name: {{.metadata.annotations.external_dns_service_account}}
                 annotations:
diff --git a/argocd/addons/vendors/aws/addons-aws-oss-external-secrets-appset.yaml b/argocd/addons/vendors/aws/addons-aws-oss-external-secrets-appset.yaml
index ae4d3b7..c2d8a34 100644
--- a/argocd/addons/vendors/aws/addons-aws-oss-external-secrets-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-oss-external-secrets-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-aws-external-secrets
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -35,38 +36,44 @@ spec:
                 addonChartVersion: 0.9.13
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              nodeSelector: 
-                {{metadata.annotations.base_nodepool_labels}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
+              nodeSelector:
+                {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
               certController:
+              {{- if .metadata.annotations.base_nodepool_labels}}
                 nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
+                  {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
               webhook:
+              {{- if .metadata.annotations.base_nodepool_labels}}
                 nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
+                  {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
               serviceAccount:
-                name: {{metadata.annotations.external_secrets_service_account}}
+                name: {{.metadata.annotations.external_secrets_service_account}}
                 annotations:
-                  eks.amazonaws.com/role-arn: {{metadata.annotations.external_secrets_iam_role_arn}}
+                  eks.amazonaws.com/role-arn: {{.metadata.annotations.external_secrets_iam_role_arn}}
       destination:
-        namespace: '{{metadata.annotations.external_secrets_namespace}}'
-        name: '{{name}}'
+        namespace: '{{.metadata.annotations.external_secrets_namespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated: {}
         syncOptions: [CreateNamespace=true, ServerSideApply=true]
diff --git a/argocd/addons/vendors/aws/addons-aws-oss-karpenter-appset.yaml b/argocd/addons/vendors/aws/addons-aws-oss-karpenter-appset.yaml
index 7df3b8e..dbd5755 100644
--- a/argocd/addons/vendors/aws/addons-aws-oss-karpenter-appset.yaml
+++ b/argocd/addons/vendors/aws/addons-aws-oss-karpenter-appset.yaml
@@ -4,6 +4,7 @@ kind: ApplicationSet
 metadata:
   name: addons-aws-karpenter
 spec:
+  goTemplate: true
   syncPolicy:
     preserveResourcesOnDeletion: true
   generators:
@@ -38,35 +39,37 @@ spec:
                 addonChartVersion: 1.1.2
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChartRepositoryNamespace}}/{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChartRepositoryNamespace}}/{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChartReleaseName}}'
+            releaseName: '{{.values.addonChartReleaseName}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              nodeSelector: 
-                {{metadata.annotations.base_nodepool_labels}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
+              nodeSelector:
+                {{.metadata.annotations.base_nodepool_labels}}
+              {{- end }}
               settings:
-                clusterName: {{metadata.annotations.aws_cluster_name}}
-                interruptionQueue: {{metadata.annotations.karpenter_sqs_queue_name}}
+                clusterName: {{.metadata.annotations.aws_cluster_name}}
+                interruptionQueue: {{.metadata.annotations.karpenter_sqs_queue_name}}
               serviceAccount:
-                name: {{metadata.annotations.karpenter_service_account}}
+                name: {{.metadata.annotations.karpenter_service_account}}
                 annotations:
-                  eks.amazonaws.com/role-arn: {{metadata.annotations.karpenter_iam_role_arn}}
+                  eks.amazonaws.com/role-arn: {{.metadata.annotations.karpenter_iam_role_arn}}
       destination:
-        namespace: '{{metadata.annotations.karpenter_namespace}}'
-        name: '{{name}}'
+        namespace: '{{.metadata.annotations.karpenter_namespace}}'
+        name: '{{.name}}'
       syncPolicy:
         automated: {}
         syncOptions:


Reviews:
user: login: uwej711
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-04-11T17:51:44Z
user: login: mcpomm
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-15T08:09:26Z

Review comments:
diff_hunk: @@ -35,38 +36,39 @@ spec:
                 addonChartVersion: 3.1.5
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              controller:
-                nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
-                serviceAccount:
-                  name: {{metadata.annotations.aws_efs_csi_driver_controller_service_account}}
-                  annotations:
-                    eks.amazonaws.com/role-arn: {{metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
path: argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml
user: login: uwej711
body: vorher war 

controller:
  nodeSelector: ...

jetzt nur noch

nodeSelector: ...
created_at: 2025-04-11T17:51:44Z
author_association: MEMBER
diff_hunk: @@ -35,38 +36,39 @@ spec:
                 addonChartVersion: 3.1.5
   template:
     metadata:
-      name: addon-{{name}}-{{values.addonChart}}
+      name: addon-{{.name}}-{{.values.addonChart}}
     spec:
       project: default
       sources:
-        - repoURL: '{{metadata.annotations.addons_repo_url}}'
-          targetRevision: '{{metadata.annotations.addons_repo_revision}}'
+        - repoURL: '{{.metadata.annotations.addons_repo_url}}'
+          targetRevision: '{{.metadata.annotations.addons_repo_revision}}'
           ref: values
-        - chart: '{{values.addonChart}}'
-          repoURL: '{{values.addonChartRepository}}'
-          targetRevision: '{{values.addonChartVersion}}'
+        - chart: '{{.values.addonChart}}'
+          repoURL: '{{.values.addonChartRepository}}'
+          targetRevision: '{{.values.addonChartVersion}}'
           helm:
-            releaseName: '{{values.addonChart}}'
+            releaseName: '{{.values.addonChart}}'
             ignoreMissingValueFiles: true
             valueFiles:
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{values.addonChart}}/values.yaml
-              - $values/{{metadata.annotations.vendor_addon_config_path}}/{{values.addonChart}}/{{metadata.labels.environment}}.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/values.yaml
+              - $values/{{.metadata.annotations.vendor_addon_config_path}}/{{.values.addonChart}}/{{.metadata.labels.environment}}.yaml
             values: |
-              controller:
-                nodeSelector:
-                  {{metadata.annotations.base_nodepool_labels}}
-                serviceAccount:
-                  name: {{metadata.annotations.aws_efs_csi_driver_controller_service_account}}
-                  annotations:
-                    eks.amazonaws.com/role-arn: {{metadata.annotations.aws_efs_csi_driver_iam_role_arn}}
+              {{- if .metadata.annotations.base_nodepool_labels}}
path: argocd/addons/vendors/aws/addons-aws-csi-efs-driver-appset.yaml
user: login: mcpomm
body: done
created_at: 2025-04-15T08:09:26Z
author_association: COLLABORATOR

PR comments:
user: login: uwej711
created_at: 2025-04-11T11:43:20Z
body: @mcpomm  argocd/addons/oss/addons-metrics-server-appset.yaml also has a nodeselector
author_association: MEMBER
user: login: uwej711
created_at: 2025-04-11T17:53:24Z
body: @mcpomm siehe Kommentar oben, da wurde mehr geändert. Wenn Absicht dann OK.
author_association: MEMBER