From 5de0f3e7382be20f90db3de6f36e958d9fa57332 Mon Sep 17 00:00:00 2001 From: dvirlabs <114520947+dvirlabs@users.noreply.github.com> Date: Sun, 27 Jul 2025 19:10:51 +0300 Subject: [PATCH] add multi envs app --- applicationSet.yaml | 18 +++++++++--------- env-sets/dev/applicationSet.yaml | 10 +++++----- env-sets/dev/metadata.yaml | 3 +++ env-sets/dev/services/svc-1.yaml | 0 env-sets/dev/services/svc-2.yaml | 0 env-sets/int/applicationSet.yaml | 31 +++++++++++++++++++++++++++++++ env-sets/int/metadata.yaml | 3 +++ env-sets/int/services/svc-1.yaml | 0 env-sets/int/services/svc-2.yaml | 0 env-sets/prod/applicationSet.yaml | 31 +++++++++++++++++++++++++++++++ env-sets/prod/metadata.yaml | 3 +++ env-sets/prod/services/svc-1.yaml | 0 env-sets/prod/services/svc-2.yaml | 0 13 files changed, 85 insertions(+), 14 deletions(-) create mode 100644 env-sets/dev/services/svc-1.yaml create mode 100644 env-sets/dev/services/svc-2.yaml create mode 100644 env-sets/int/services/svc-1.yaml create mode 100644 env-sets/int/services/svc-2.yaml create mode 100644 env-sets/prod/services/svc-1.yaml create mode 100644 env-sets/prod/services/svc-2.yaml diff --git a/applicationSet.yaml b/applicationSet.yaml index 6494914..e8de941 100644 --- a/applicationSet.yaml +++ b/applicationSet.yaml @@ -1,29 +1,29 @@ +# file: applicationsets/envs-appset.yaml in app-definition.git (optional location) apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: net-envs-appset + name: envs-appset namespace: argocd spec: generators: - git: - repoURL: https://git.dvirlabs.com/app-definition.git + repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git revision: HEAD files: - - path: net-envs/*/metadata.yaml + - path: env-sets/*/metadata.yaml extract: env: '{{.env}}' - project: '{{.project}}' namespace: '{{.namespace}}' + project: '{{.project}}' template: metadata: - name: net-env-{{env}} + name: env-{{env}} spec: project: '{{project}}' source: - repoURL: https://git.dvirlabs.com/app-definition.git - path: env-sets - directory: - recurse: true + repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git + targetRevision: HEAD + path: env-sets/{{env}} destination: server: https://kubernetes.default.svc namespace: '{{namespace}}' diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml index b5d06ad..01265d3 100644 --- a/env-sets/dev/applicationSet.yaml +++ b/env-sets/dev/applicationSet.yaml @@ -1,15 +1,15 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: dev-ms-apps + name: dev-microservices namespace: argocd spec: generators: - git: - repoURL: https://github.com/your-org/apps-config.git + repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git revision: HEAD files: - - path: net-envs/dev/*.yaml + - path: env-sets/dev/services/*.yaml template: metadata: name: dev-{{basenameNormalized}} @@ -18,10 +18,10 @@ spec: source: repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git targetRevision: HEAD - chart: charts/nginx-message + chart: ngnix-message helm: valueFiles: - - env-sets/dev/values.yaml + - env-sets/dev/services/{{path.basename}} destination: server: https://kubernetes.default.svc namespace: dev diff --git a/env-sets/dev/metadata.yaml b/env-sets/dev/metadata.yaml index e69de29..bf2888a 100644 --- a/env-sets/dev/metadata.yaml +++ b/env-sets/dev/metadata.yaml @@ -0,0 +1,3 @@ +env: dev +namespace: dev +project: sandbox diff --git a/env-sets/dev/services/svc-1.yaml b/env-sets/dev/services/svc-1.yaml new file mode 100644 index 0000000..e69de29 diff --git a/env-sets/dev/services/svc-2.yaml b/env-sets/dev/services/svc-2.yaml new file mode 100644 index 0000000..e69de29 diff --git a/env-sets/int/applicationSet.yaml b/env-sets/int/applicationSet.yaml index e69de29..2b08961 100644 --- a/env-sets/int/applicationSet.yaml +++ b/env-sets/int/applicationSet.yaml @@ -0,0 +1,31 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: int-microservices + namespace: argocd +spec: + generators: + - git: + repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git + revision: HEAD + files: + - path: env-sets/int/services/*.yaml + template: + metadata: + name: int-{{basenameNormalized}} + spec: + project: default + source: + repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git + targetRevision: HEAD + chart: ngnix-message + helm: + valueFiles: + - env-sets/int/services/{{path.basename}} + destination: + server: https://kubernetes.default.svc + namespace: int + syncPolicy: + automated: + selfHeal: true + prune: true diff --git a/env-sets/int/metadata.yaml b/env-sets/int/metadata.yaml index e69de29..0c2aa3f 100644 --- a/env-sets/int/metadata.yaml +++ b/env-sets/int/metadata.yaml @@ -0,0 +1,3 @@ +env: int +namespace: int +project: sandbox diff --git a/env-sets/int/services/svc-1.yaml b/env-sets/int/services/svc-1.yaml new file mode 100644 index 0000000..e69de29 diff --git a/env-sets/int/services/svc-2.yaml b/env-sets/int/services/svc-2.yaml new file mode 100644 index 0000000..e69de29 diff --git a/env-sets/prod/applicationSet.yaml b/env-sets/prod/applicationSet.yaml index e69de29..b3462af 100644 --- a/env-sets/prod/applicationSet.yaml +++ b/env-sets/prod/applicationSet.yaml @@ -0,0 +1,31 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: prod-microservices + namespace: argocd +spec: + generators: + - git: + repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git + revision: HEAD + files: + - path: env-sets/prod/services/*.yaml + template: + metadata: + name: prod-{{basenameNormalized}} + spec: + project: default + source: + repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git + targetRevision: HEAD + chart: ngnix-message + helm: + valueFiles: + - env-sets/prod/services/{{path.basename}} + destination: + server: https://kubernetes.default.svc + namespace: prod + syncPolicy: + automated: + selfHeal: true + prune: true diff --git a/env-sets/prod/metadata.yaml b/env-sets/prod/metadata.yaml index e69de29..d0659cb 100644 --- a/env-sets/prod/metadata.yaml +++ b/env-sets/prod/metadata.yaml @@ -0,0 +1,3 @@ +env: prod +namespace: prod +project: sandbox diff --git a/env-sets/prod/services/svc-1.yaml b/env-sets/prod/services/svc-1.yaml new file mode 100644 index 0000000..e69de29 diff --git a/env-sets/prod/services/svc-2.yaml b/env-sets/prod/services/svc-2.yaml new file mode 100644 index 0000000..e69de29