applicationSet.yaml

@@ -10,6 +10,10 @@ spec:
         revision: HEAD
         files:
           - path: env-sets/*/metadata.yaml
+        extract:
+          env: '{{.env}}'
+          namespace: '{{.namespace}}'
+          project: '{{.project}}'
   template:
     metadata:
       name: env-{{env}}
@@ -24,8 +28,8 @@ spec:
       destination:
         server: https://kubernetes.default.svc
         namespace: '{{namespace}}'
-      syncPolicy:
-        automated:
-          prune: true
-          selfHeal: true
-
+      syncPolicy: {}
+        # automated:
+        #   selfHeal: true
+        # syncOption:
+        #   - Prune=false

env-sets/dev/applicationSet.yaml

@@ -9,10 +9,10 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/dev/services/*.yaml
+          - path: env-sets/dev/services/*/svc-*.yaml
   template:
     metadata:
-      name: '{{service.name}}-dev'
+      name: '{{ path.basename }}-dev'
     spec:
       project: sandbox
       destination:
@@ -24,7 +24,7 @@ spec:
           path: nginx-message
           helm:
             valueFiles:
-              - $values/env-sets/dev/services/{{service.name}}.yaml
+              - $values/env-sets/dev/services/{{ path.basename }}.yaml
         - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
           targetRevision: HEAD
           ref: values

env-sets/dev/services/svc-1.yaml

@@ -1,4 +1,4 @@
-message: "Welcome to svc-1 in dev hi this is a test"
+message: "Welcome to svc-1 in dev"
 image:
   repository: nginx
   tag: stable

env-sets/dev/services/svc-3.yaml

@@ -1,9 +0,0 @@
-message: "Welcome to svc-3 in dev"
-image:
-  repository: nginx
-  tag: stable
-  pullPolicy: IfNotPresent
-service:
-  name: svc-3                  # 🟡 OPTIONAL: if your chart supports it
-  type: ClusterIP
-  port: 80

env-sets/int/applicationSet.yaml

@@ -9,25 +9,26 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/int/services/*.yaml
+          - path: env-sets/int/services/*/check.yaml
   template:
     metadata:
-      name: '{{service.name}}-int'
+      name: '{{ path.basename }}-int'
     spec:
       project: sandbox
       destination:
         server: https://kubernetes.default.svc
         namespace: int
       sources:
-        - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
-          targetRevision: HEAD
-          path: nginx-message
-          helm:
-            valueFiles:
-              - $values/env-sets/int/services/{{service.name}}.yaml
-        - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
-          targetRevision: HEAD
-          ref: values
-      syncPolicy: {}
-        # automated:
-        #   selfHeal: true
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
+        targetRevision: HEAD
+        path: ngnix-message
+        helm:
+          valueFiles:
+            - '$values/{{ .path.path }}/service.yaml'
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
+        targetRevision: HEAD
+        ref: values
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true

env-sets/prod/applicationSet.yaml

@@ -9,25 +9,26 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/prod/services/*.yaml
+          - path: env-sets/prod/services/*/service.yaml
   template:
     metadata:
-      name: '{{service.name}}-prod'
+      name: '{{ path.basename }}-prod'
     spec:
       project: sandbox
       destination:
         server: https://kubernetes.default.svc
         namespace: prod
       sources:
-        - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
-          targetRevision: HEAD
-          path: nginx-message
-          helm:
-            valueFiles:
-              - $values/env-sets/prod/services/{{service.name}}.yaml
-        - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
-          targetRevision: HEAD
-          ref: values
-      syncPolicy: {}
-        # automated:
-        #   selfHeal: true
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
+        targetRevision: HEAD
+        path: ngnix-message
+        helm:
+          valueFiles:
+            - '$values/{{ .path.path }}/service.yaml'
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
+        targetRevision: HEAD
+        ref: values
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true

env-sets/prod/services/svc-1.yaml

@@ -1,9 +0,0 @@
-message: "Welcome to svc-1 in prod"
-image:
-  repository: nginx
-  tag: stable
-  pullPolicy: IfNotPresent
-service:
-  name: svc-1                  # 🟡 OPTIONAL: if your chart supports it
-  type: ClusterIP
-  port: 80

env-sets/prod/services/svc-2.yaml

@@ -1,9 +0,0 @@
-message: "Welcome to svc-2 in prod"
-image:
-  repository: nginx
-  tag: stable
-  pullPolicy: IfNotPresent
-service:
-  name: svc-2                  # 🟡 OPTIONAL: if your chart supports it
-  type: ClusterIP
-  port: 80