From 69a0767c07a880af856ea5aca424c30092ebaf38 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Tue, 29 Jul 2025 12:02:29 +0300 Subject: [PATCH] Fix int and prod --- env-sets/int/applicationSet.yaml | 29 ++++++++++++++--------------- env-sets/prod/applicationSet.yaml | 29 ++++++++++++++--------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/env-sets/int/applicationSet.yaml b/env-sets/int/applicationSet.yaml index 7e1f60d..a415a14 100644 --- a/env-sets/int/applicationSet.yaml +++ b/env-sets/int/applicationSet.yaml @@ -9,26 +9,25 @@ spec: repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git revision: HEAD files: - - path: env-sets/int/services/*/check.yaml + - path: env-sets/int/services/*.yaml template: metadata: - name: '{{ path.basename }}-int' + name: '{{service.name}}-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: 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 + - 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 \ No newline at end of file diff --git a/env-sets/prod/applicationSet.yaml b/env-sets/prod/applicationSet.yaml index 25aa155..ee2dc4a 100644 --- a/env-sets/prod/applicationSet.yaml +++ b/env-sets/prod/applicationSet.yaml @@ -9,26 +9,25 @@ spec: repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git revision: HEAD files: - - path: env-sets/prod/services/*/service.yaml + - path: env-sets/prod/services/*.yaml template: metadata: - name: '{{ path.basename }}-prod' + name: '{{service.name}}-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: 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 + - 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 \ No newline at end of file