From fe0fba748905b611cdf2840641cef29d6fbf7f2e Mon Sep 17 00:00:00 2001 From: alcampag Date: Thu, 9 Oct 2025 10:56:00 +0200 Subject: [PATCH 1/2] oke-gitops-1.1.1 --- .../example-app/config/config-hub.json | 9 ++ .../example-app/config/config-prod.json | 9 ++ .../app-category/example-app/helm/Chart.yaml | 6 + .../helm/templates/deployment.yaml | 19 ++++ .../example-app/helm/templates/service.yaml | 12 ++ .../values}/clusters/values-in-cluster.yml | 0 .../helm/values}/values-common.yml | 0 .../helm/values}/values-no-prod.yml | 0 .../example-app/helm/values}/values-prod.yml | 0 .../example-app/helm/values}/values-qa.yml | 0 .../example-app/helm/values}/values-uk.yml | 0 .../helm/values}/variants/values-agent.yml | 0 .../helm/values}/version/values-qa.yml | 0 .../kustomize}/base/kustomization.yml | 0 .../kustomize/overlays/hub}/kustomization.yml | 0 .../overlays/no-prod}/kustomization.yml | 0 .../overlays/prod}/kustomization.yml | 0 .../kustomize/overlays/qa}/kustomization.yml | 0 .../apps/helm/charts/example-app/Chart.yaml | 9 -- .../apps-cluster-config/appsets/Chart.yaml | 9 -- .../appsets/examples/helm-apps-qa.yml | 63 ----------- .../appsets/examples/kustomize-apps-qa.yml | 50 -------- .../appsets/hub/app-category/example-app.yml | 57 ++++++++++ .../appsets/hub/infra.yml} | 21 ++-- .../apps-cluster-config/{root.yml => hub.yml} | 14 +-- .../repos/system-cluster-config/README.md | 107 +++++++++++++++--- .../example-app/config/config-hub.json | 9 ++ .../example-app/config/config-prod.json | 9 ++ .../values/clusters/values-in-cluster.yml} | 0 .../helm/values}/values-common.yml | 0 .../helm/values}/values-no-prod.yml | 0 .../example-app/helm/values}/values-prod.yml | 0 .../example-app/helm/values}/values-qa.yml | 0 .../example-app/helm/values}/values-uk.yml | 0 .../helm/values/variants/values-agent.yml} | 0 .../helm/values}/version/values-qa.yml | 0 .../kustomize}/base/kustomization.yml | 0 .../kustomize/overlays}/hub/kustomization.yml | 0 .../overlays/no-prod}/kustomization.yml | 0 .../overlays/prod}/kustomization.yml | 0 .../kustomize/overlays/qa}/kustomization.yml | 0 .../apps/ci-cd/argocd/config/config-hub.json | 9 ++ .../argocd/helm/values}/values-common.yml | 0 .../argocd/helm/values}/values-hub.yml | 0 .../argocd/kustomize}/base/kustomization.yml | 0 .../kustomize}/base/secret/in-cluster.yml | 0 .../kustomize/overlays/hub}/kustomization.yml | 0 .../values/example-app/envs/values-prod.yml | 0 .../example-app/base/kustomization.yml | 4 - .../system-cluster-config/appsets/Chart.yaml | 9 -- .../appsets/examples/helm-no-prod.yml | 54 --------- .../appsets/examples/helm-qa.yml | 60 ---------- .../appsets/examples/helm-single-cluster.yml | 52 --------- .../appsets/hub/ci-cd/argocd.yml | 57 ++++++++++ .../appsets/hub/infra.yml | 41 +++++++ .../appsets/templates/argocd.yml | 48 -------- .../{root.yml => hub.yml} | 14 +-- .../infra/base}/.gitkeep | 0 .../charts => infra/overlays/hub}/.gitkeep | 0 59 files changed, 351 insertions(+), 400 deletions(-) create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-hub.json create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-prod.json create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/Chart.yaml create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/deployment.yaml create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/service.yaml rename app-dev/devops-and-containers/oke/oke-gitops/repos/{system-cluster-config/apps/helm/values/example-app => apps-cluster-config/apps/app-category/example-app/helm/values}/clusters/values-in-cluster.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app => app-category/example-app/helm/values}/values-common.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app/env-type => app-category/example-app/helm/values}/values-no-prod.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app/envs => app-category/example-app/helm/values}/values-prod.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app/envs => app-category/example-app/helm/values}/values-qa.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app/regions => app-category/example-app/helm/values}/values-uk.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/{system-cluster-config/apps/helm/values/example-app => apps-cluster-config/apps/app-category/example-app/helm/values}/variants/values-agent.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{helm/values/example-app => app-category/example-app/helm/values}/version/values-qa.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{kustomize/example-app => app-category/example-app/kustomize}/base/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{kustomize/example-app/env-type/no-prod => app-category/example-app/kustomize/overlays/hub}/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{kustomize/example-app/envs/prod => app-category/example-app/kustomize/overlays/no-prod}/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/{kustomize/example-app/envs/qa => app-category/example-app/kustomize/overlays/prod}/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/{system-cluster-config/apps/kustomize/argocd/env-type/hub => apps-cluster-config/apps/app-category/example-app/kustomize/overlays/qa}/kustomization.yml (100%) delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/Chart.yaml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/Chart.yaml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/helm-apps-qa.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/kustomize-apps-qa.yml create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/app-category/example-app.yml rename app-dev/devops-and-containers/oke/oke-gitops/repos/{system-cluster-config/appsets/examples/hub-config.yml => apps-cluster-config/appsets/hub/infra.yml} (59%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/{root.yml => hub.yml} (55%) create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-hub.json create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-prod.json rename app-dev/devops-and-containers/oke/oke-gitops/repos/{apps-cluster-config/apps/helm/charts/example-app/templates/.gitkeep => system-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml} (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/example-app => app-category/example-app/helm/values}/values-common.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/example-app/env-type => app-category/example-app/helm/values}/values-no-prod.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/{apps-cluster-config/apps/helm/values/example-app/version => system-cluster-config/apps/app-category/example-app/helm/values}/values-prod.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/example-app/envs => app-category/example-app/helm/values}/values-qa.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/example-app/regions => app-category/example-app/helm/values}/values-uk.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/{apps-cluster-config/apps/helm/values/example-app/variants/.gitkeep => system-cluster-config/apps/app-category/example-app/helm/values/variants/values-agent.yml} (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/example-app => app-category/example-app/helm/values}/version/values-qa.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/config => app-category/example-app/kustomize}/base/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/config/env-type => app-category/example-app/kustomize/overlays}/hub/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/example-app/env-type/hub => app-category/example-app/kustomize/overlays/no-prod}/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/example-app/env-type/no-prod => app-category/example-app/kustomize/overlays/prod}/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/example-app/envs/prod => app-category/example-app/kustomize/overlays/qa}/kustomization.yml (100%) create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/config/config-hub.json rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/argocd => ci-cd/argocd/helm/values}/values-common.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{helm/values/argocd/env-type => ci-cd/argocd/helm/values}/values-hub.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/argocd => ci-cd/argocd/kustomize}/base/kustomization.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/argocd => ci-cd/argocd/kustomize}/base/secret/in-cluster.yml (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/{kustomize/example-app/envs/qa => ci-cd/argocd/kustomize/overlays/hub}/kustomization.yml (100%) delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/envs/values-prod.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/base/kustomization.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/Chart.yaml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-no-prod.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-qa.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-single-cluster.yml create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/ci-cd/argocd.yml create mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/infra.yml delete mode 100644 app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/templates/argocd.yml rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/{root.yml => hub.yml} (55%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/{apps-cluster-config/appsets/templates => system-cluster-config/infra/base}/.gitkeep (100%) rename app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/{apps/helm/charts => infra/overlays/hub}/.gitkeep (100%) diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-hub.json b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-hub.json new file mode 100644 index 000000000..bfbfb40ec --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-hub.json @@ -0,0 +1,9 @@ +{ + "chart": { + "repo": "https://example-app/chart", + "name": "app", + "version": "*", + "release-name": "example-app" + }, + "namespace": "default" +} \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-prod.json b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-prod.json new file mode 100644 index 000000000..218fd141c --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-prod.json @@ -0,0 +1,9 @@ +{ + "chart": { + "repo": "https://example-app/chart", + "name": "app", + "version": "1.0.0", + "release-name": "example-app" + }, + "namespace": "default" +} \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/Chart.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/Chart.yaml new file mode 100644 index 000000000..9bbea1b24 --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: example-app +description: A Helm chart for example-app +type: application +version: 0.1.0 +appVersion: "1.0.0" diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/deployment.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/deployment.yaml new file mode 100644 index 000000000..fc24bfe69 --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/deployment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Chart.Name }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ .Chart.Name }} + template: + metadata: + labels: + app: {{ .Chart.Name }} + spec: + containers: + - name: {{ .Chart.Name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + ports: + - containerPort: 80 diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/service.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/service.yaml new file mode 100644 index 000000000..f7a36b979 --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/templates/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Chart.Name }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: 80 + protocol: TCP + selector: + app: {{ .Chart.Name }} diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/clusters/values-in-cluster.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/clusters/values-in-cluster.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/values-common.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-common.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/values-common.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-common.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/env-type/values-no-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-no-prod.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/env-type/values-no-prod.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-no-prod.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/envs/values-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-prod.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/envs/values-prod.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-prod.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/envs/values-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-qa.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/envs/values-qa.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-qa.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/regions/values-uk.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-uk.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/regions/values-uk.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/values-uk.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/variants/values-agent.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/variants/values-agent.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/variants/values-agent.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/variants/values-agent.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/version/values-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/version/values-qa.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/version/values-qa.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/version/values-qa.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/base/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/base/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/base/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/base/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/env-type/no-prod/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/hub/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/env-type/no-prod/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/hub/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/envs/prod/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/no-prod/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/envs/prod/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/no-prod/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/envs/qa/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/prod/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/kustomize/example-app/envs/qa/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/prod/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/env-type/hub/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/qa/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/env-type/hub/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/kustomize/overlays/qa/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/Chart.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/Chart.yaml deleted file mode 100644 index 664517939..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: appsets -description: An example of a Helm application - -type: application - -version: 1.0.0 - -appVersion: "1.0.0" diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/Chart.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/Chart.yaml deleted file mode 100644 index 83d9169f3..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: appsets -description: A Helm chart for the AppSets deployment - -type: application - -version: 1.0.0 - -appVersion: "1.0.0" diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/helm-apps-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/helm-apps-qa.yml deleted file mode 100644 index 014a4e773..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/helm-apps-qa.yml +++ /dev/null @@ -1,63 +0,0 @@ -# Deploy all helm application on all qa clusters. - -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: helm-apps-qa - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - matrix: - generators: - - git: - repoURL: {{ .Values.repo }} - revision: HEAD - directories: - - path: apps/helm/charts/* - - clusters: - selector: - matchLabels: - type: "workload" - matchExpressions: - - key: "qa" - operator: In - values: - - "true" - - syncPolicy: - preserveResourcesOnDeletion: false # If true, application will be kept even if removed from ArgoCD - template: - metadata: - name: '{{ "{{" }}index .path.segments 3{{ "}}" }}-{{ "{{" }}.nameNormalized{{ "}}" }}-qa' - spec: - project: team-project # Project dedicated to this development team - sources: - - repoURL: {{ .Values.repo }} - path: '{{ "{{" }}.path.path{{ "}}" }}' - targetRevision: HEAD # Git HEAD will represent the latest state of the applications - helm: - releaseName: '{{ "{{" }}index .path.segments 3{{ "}}" }}-qa' - valueFiles: - - $values/apps/helm/values/{{ "{{" }}index .path.segments 3{{ "}}" }}/values-common.yml - - $values/apps/helm/values/{{ "{{" }}index .path.segments 3{{ "}}" }}/env-type/values-no-prod.yml - # If you have some image tag version that differ between environments - - $values/apps/helm/values/{{ "{{" }}index .path.segments 3{{ "}}" }}/version/values-qa.yml - # Environment specific configurations - - $values/apps/helm/values/{{ "{{" }}index .path.segments 3{{ "}}" }}/envs/values-qa.yml - - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - ref: values - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: 'namespace-qa' # This is just the default qa namespace. If an application needs to be deployed on another namespace, it must be set in the helm values - syncPolicy: - syncOptions: - - CreateNamespace=false # qa namespace should already have been created - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/kustomize-apps-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/kustomize-apps-qa.yml deleted file mode 100644 index 73bc88672..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/examples/kustomize-apps-qa.yml +++ /dev/null @@ -1,50 +0,0 @@ -# Deploy all helm application on all qa clusters. - -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: helm-apps-qa - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - matrix: - generators: - - git: - repoURL: {{ .Values.repo }} - revision: HEAD - directories: - - path: apps/kustomize/*/envs/qa - - clusters: - selector: - matchLabels: - type: "workload" - matchExpressions: - - key: "qa" - operator: In - values: - - "true" - - syncPolicy: - preserveResourcesOnDeletion: false # If true, application will be kept even if removed from ArgoCD - template: - metadata: - name: '{{ "{{" }}index .path.segments 2{{ "}}" }}-{{ "{{" }}.nameNormalized{{ "}}" }}-qa' - spec: - project: team-project # Project dedicated to this development team - sources: - - repoURL: {{ .Values.repo }} - path: '{{ "{{" }}.path.path{{ "}}" }}' - targetRevision: HEAD # Git HEAD will represent the latest state of the applications - - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: 'namespace-qa' # This is just the default qa namespace. If an application needs to be deployed on another namespace, it must be set in the helm values - syncPolicy: - syncOptions: - - CreateNamespace=false # qa namespace should already have been created - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/app-category/example-app.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/app-category/example-app.yml new file mode 100644 index 000000000..21bbd7522 --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/app-category/example-app.yml @@ -0,0 +1,57 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: example-app + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: [ "missingkey=error" ] + generators: + - matrix: + generators: + - clusters: + selector: + matchLabels: + type: "hub" + - git: + repoURL: #REPOURL + revision: HEAD + files: + - path: "apps/app-category/example-app/config/config-{{.metadata.labels.type}}.json" + + # If you want to delete everything if the Application is deleted, set this to false and then delete the Application. This is just a safeguard + syncPolicy: + preserveResourcesOnDeletion: true + template: + metadata: + name: '{{index .path.segments 2}}-{{.nameNormalized}}' + spec: + project: default + sources: + + - repoURL: '{{.chart.repo}}' + chart: '{{.chart.name}}' + targetRevision: '{{.chart.version}}' + helm: + releaseName: '{{.chart.releaseName}}' + valueFiles: + - $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-common.yml + - $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-{{.metadata.labels.type }}.yml + + - repoURL: #REPOURL + targetRevision: HEAD + path: apps/{{index .path.segments 1}}/{{index .path.segments 2}}/kustomize/overlays/{{ .metadata.labels.type }} + + - repoURL: #REPOURL + targetRevision: HEAD + ref: values + destination: + server: '{{.server}}' + namespace: '{{.namespace}}' + syncPolicy: + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + automated: + prune: true + selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/hub-config.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/infra.yml similarity index 59% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/hub-config.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/infra.yml index ec51467a6..34aa742de 100644 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/hub-config.yml +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/hub/infra.yml @@ -1,10 +1,7 @@ -# Kustomize application containing cluster configurations for the hub cluster. - - apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: hub-config + name: hub-infra namespace: argocd spec: goTemplate: true @@ -15,22 +12,26 @@ spec: matchLabels: type: "hub" + + # If you want to delete everything if the Application is deleted, set this to false and then delete the Application. This is just a safeguard syncPolicy: preserveResourcesOnDeletion: true template: metadata: - name: 'hub-config' + name: 'hub-infra' spec: project: default sources: - # Global config for each cluster - - repoURL: {{ .Values.repo }} + - repoURL: #REPOURL targetRevision: HEAD - path: apps/kustomize/config/env-type/{{ "{{" }}.metadata.labels.type{{ "}}" }} + path: infra/overlays/{{ .metadata.labels.type }} + - repoURL: #REPOURL + targetRevision: HEAD + ref: values destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: argocd + server: '{{.server}}' + namespace: default syncPolicy: syncOptions: - CreateNamespace=true diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/root.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/hub.yml similarity index 55% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/root.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/hub.yml index 28adb84ab..4939d4fd0 100644 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/root.yml +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/hub.yml @@ -1,20 +1,18 @@ -# Insert Git repository where the cluster configurations are located, with .git postfix. This template has to be applied manually +# Insert Git repository with .git postfix. This template has to be applied manually apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: apps-cluster-config + name: hub-apps namespace: argocd spec: project: default source: - repoURL: ${REPO} + repoURL: #RepoURL targetRevision: HEAD - path: appsets - helm: - parameters: - - name: repo - value: ${REPO} + path: appsets/hub + directory: + recurse: true destination: server: https://kubernetes.default.svc namespace: argocd diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/README.md b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/README.md index 71a327d06..b5d292781 100644 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/README.md +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/README.md @@ -1,4 +1,9 @@ -# First access to ArgoCD +# System Cluster Configuration Repository + +This Git repository serves as a centralized configuration hub for managing Kubernetes clusters using ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. + + +## First access to ArgoCD ArgoCD has been installed in the argocd namespace of the cluster. For the first access, you can get the admin password directly from the secret by running this command: @@ -13,7 +18,7 @@ After running the command, you should be able to access ArgoCD UI from `localhos NOTE: If you have deployed the Helm Chart on a private OKE cluster, you will need to perform some networking setup to be able to connect through kubectl. -# Connecting to the OCI Code Repository +## Connecting to the OCI Code Repository Under `Settings --> Repositories` click on **CONNECT REPO** and select to connect to a repository **VIA HTTPS**. Fill the form with the following values: @@ -22,33 +27,103 @@ Fill the form with the following values: 3. `Username`: \ 4. `Password`: \ -The repository we want to connect to is the oke-cluster-config repository in OCI DevOps, already created by the Resource Manager Stack. +The repository we want to connect to is the system-cluster-config repository in OCI DevOps, already created by the Resource Manager Stack. It's better to go into the OCI DevOps, find the repository, and find the right HTTPS clone URL. NOTE: The username to connect to the OCI DevOps Code Repository should be `//` -# Clone the OCI Code Repository locally +## Clone the OCI Code Repository locally It is always better to clone the Git repository locally and have an appropriate IDE where we can work. A lot of YAMLs are involved when managing a cluster, so it's important to correctly indent the code. -Once you have cloned the **oke-cluster-config**, it's time to perform the following actions: +Once you have cloned the **system-cluster-config**, it's time to perform the following actions: 1. Deploy the cluster secret by running `kubectl apply -f in-cluster.yml` -2. Substitute ${REPO} with the repository https URL from OCI DevOps -3. Push the code to the remote Git repository (optional) -4. Run `kubectl apply -f root.yml` +2. Substitute `#RepoURL` in `hub.yml` with the repository https URL from OCI DevOps +3. Substitute `#RepoURL` in `appsets/hub/ci-cd/argocd.yml` and `appsets/hub/infra.yml` with the repository https URL from OCI DevOps +3. Push the code to the remote Git repository +4. Run `kubectl apply -f hub.yml` 5. You will lose the port-forwarding session if still active, but don't worry, it's something expected -6. Access to the ArgoCD UI, and be sure that `all-apps` application is synchronized +6. Access to the ArgoCD UI, and be sure that `hub-apps` application is synchronized After having performed these steps, you will have an installation of ArgoCD configured with the apps-of-apps pattern. -# How to use this template +## Overview + +ArgoCD is a tool that automates the deployment of applications to Kubernetes clusters by keeping the cluster state in sync with configurations stored in Git repositories. It provides a web UI for visualizing applications, their statuses, and allowing manual or automated syncing. + +This repository organizes configurations to install tools and configure clusters through ArgoCD ApplicationSets. ApplicationSets are templates that generate multiple ArgoCD Applications based on defined criteria, allowing scalable deployment across multiple clusters. + +## Key Concepts + +- **Clusters**: Kubernetes clusters managed by ArgoCD. Each cluster is registered as a Secret in the ArgoCD namespace with labels indicating its type (e.g., "hub" for the main ArgoCD server cluster, "workload" for application clusters), region, provider, and environment. + +- **Applications**: Individual deployments managed by ArgoCD, pointing to Helm charts, Kustomize manifests, or plain YAMLs. + +- **ApplicationSets**: Templates that generate Applications dynamically. They use generators to define where (clusters) and what (applications) to deploy. + +## Repository Structure + +``` +repos/system-cluster-config/ +├── hub.yml # ArgoCD Application to deploy ApplicationSets to the hub cluster +├── in-cluster.yml # Secret defining the hub cluster itself +├── apps/ # Application definitions, organized by category +│ ├── ci-cd/ # Category for CI/CD tools +│ │ └── argocd/ # ArgoCD application +│ │ ├── config/ # Configuration JSON for cluster profiles +│ │ ├── helm/ # Helm values for profiles +│ │ └── kustomize/ # Kustomize overlays for profiles +│ └── app-category/ # Category for example applications +│ └── example-app/ # Example application +│ ├── config/ # Profile-specific configs +│ ├── helm/ # Helm values per profile +│ └── kustomize/ # Kustomize overlays per profile +├── appsets/ # ApplicationSet definitions +│ └── hub/ # Profile-specific ApplicationSets (hub profile) +│ ├── ci-cd/ +│ │ └── argocd.yml # ApplicationSet for deploying ArgoCD +│ └── infra.yml # ApplicationSet for infrastructure apps +└── infra/ # Cluster-level infrastructure resources + ├── base/ # Base kustomize resources (quotas, namespaces, etc.) + └── overlays/ # Profile-specific overlays (e.g., hub/) +``` + +### Infrastructure Folder + +The `infra/` folder contains cluster-level resources deployed via Kustomize, similar to application structures. It includes base resources and profile-specific overlays. + +- **Base Resources**: Common cluster resources like ResourceQuotas, Namespaces, PersistentVolumeClaims, ValidatingAdmissionPolicies, etc. +- **Overlays**: Customizations per profile (e.g., `overlays/hub/` for hub-specific infra). + +This ensures foundational cluster configurations are managed consistently across profiles. + +### Workflow + +1. **Define Clusters**: Create Secrets in ArgoCD for each cluster, labeled appropriately (e.g., `type: hub`). + +2. **Bootstrap Hub**: Apply `hub.yml` to deploy ApplicationSets to the hub cluster. This creates ApplicationSets that will generate Applications for matching clusters. + +3. **ApplicationSets Generate Applications**: Each ApplicationSet uses generators to: + - Select clusters based on labels (e.g., `type: hub`). + - Pull configuration from `apps/*/config/config-*.json` to define what to deploy. + +4. **Deploy Applications**: Generated Applications deploy using sources like Helm charts with values, Kustomize overlays, etc., tailored to the cluster type. + +## Profiles and Overlays + +Cluster profiles are defined by labels on cluster Secrets (e.g., `type: hub`, `type: workload`). These profiles determine which clusters an application deploys to and how it's configured. + +- **Profiles**: Hub profile targets clusters with ArgoCD installed. Other profiles (e.g., workload) target application clusters. +- **Kustomize Overlays**: In `apps/category/app/kustomize/overlays/`, provide profile-specific customizations (e.g., `overlays/hub/` for hub clusters). +- **Helm Values**: In `apps/category/app/helm/values/`, YAML files tailored to profiles (e.g., `values-hub.yml`, `values-workload.yml`). -The concept is simple, there are some naming conventions that need to be known so that everything is kept in order. +Applications are organized into category folders (e.g., `ci-cd/`, `app-category/`) to maintain order and scalability. -## Apps folder -The apps folder will contain the applications to deploy in the cluster. Applications can be helm or kustomize charts. Examples are in each folder. +## Summary -## AppSets folder +1. Set up ArgoCD on your hub cluster. +2. Register clusters as Secrets (apply `in-cluster.yml` for the hub). +3. Customize `hub.yml` with the repo URL and apply it. +4. ApplicationSets will automatically generate and deploy applications to matching clusters. -The `appsets` folder is structured as a Helm chart for convenience. It contains all the code necessary to instruct ArgoCD on what applications to deploy, in which cluster and namespace. All YAMLs are in the `templates` folder. -The folder in examples contains some examples using generators to deploy applications. +For detailed ArgoCD documentation, visit [argo-cd.readthedocs.io](https://argo-cd.readthedocs.io). diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-hub.json b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-hub.json new file mode 100644 index 000000000..bfbfb40ec --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-hub.json @@ -0,0 +1,9 @@ +{ + "chart": { + "repo": "https://example-app/chart", + "name": "app", + "version": "*", + "release-name": "example-app" + }, + "namespace": "default" +} \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-prod.json b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-prod.json new file mode 100644 index 000000000..218fd141c --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/config/config-prod.json @@ -0,0 +1,9 @@ +{ + "chart": { + "repo": "https://example-app/chart", + "name": "app", + "version": "1.0.0", + "release-name": "example-app" + }, + "namespace": "default" +} \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/templates/.gitkeep b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/templates/.gitkeep rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/values-common.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-common.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/values-common.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-common.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/env-type/values-no-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-no-prod.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/env-type/values-no-prod.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-no-prod.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/version/values-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-prod.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/version/values-prod.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-prod.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/envs/values-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-qa.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/envs/values-qa.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-qa.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/regions/values-uk.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-uk.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/regions/values-uk.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-uk.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/variants/.gitkeep b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/variants/values-agent.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/values/example-app/variants/.gitkeep rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/variants/values-agent.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/version/values-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/version/values-qa.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/version/values-qa.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/version/values-qa.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/config/base/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/base/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/config/base/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/base/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/config/env-type/hub/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/hub/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/config/env-type/hub/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/hub/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/env-type/hub/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/no-prod/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/env-type/hub/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/no-prod/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/env-type/no-prod/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/prod/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/env-type/no-prod/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/prod/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/envs/prod/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/qa/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/envs/prod/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/kustomize/overlays/qa/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/config/config-hub.json b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/config/config-hub.json new file mode 100644 index 000000000..95363d1fe --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/config/config-hub.json @@ -0,0 +1,9 @@ +{ + "chart": { + "repo": "https://argoproj.github.io/argo-helm", + "name": "argo-cd", + "version": "*", + "release-name": "argocd" + }, + "namespace": "argocd" +} \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/argocd/values-common.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/helm/values/values-common.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/argocd/values-common.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/helm/values/values-common.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/argocd/env-type/values-hub.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/helm/values/values-hub.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/argocd/env-type/values-hub.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/helm/values/values-hub.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/base/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/base/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/base/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/base/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/base/secret/in-cluster.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/base/secret/in-cluster.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/argocd/base/secret/in-cluster.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/base/secret/in-cluster.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/envs/qa/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/overlays/hub/kustomization.yml similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/envs/qa/kustomization.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/ci-cd/argocd/kustomize/overlays/hub/kustomization.yml diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/envs/values-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/values/example-app/envs/values-prod.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/base/kustomization.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/base/kustomization.yml deleted file mode 100644 index b1745d738..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/kustomize/example-app/base/kustomization.yml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: [] \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/Chart.yaml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/Chart.yaml deleted file mode 100644 index 83d9169f3..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: appsets -description: A Helm chart for the AppSets deployment - -type: application - -version: 1.0.0 - -appVersion: "1.0.0" diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-no-prod.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-no-prod.yml deleted file mode 100644 index 8fe73e89d..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-no-prod.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Deploy a single application on all non-prod clusters. - -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: example-app - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - clusters: - selector: - matchExpressions: - - key: "prod" - operator: DoesNotExists - - syncPolicy: - preserveResourcesOnDeletion: true - template: - metadata: - name: 'example-app-{{ "{{" }}.nameNormalized{{ "}}" }}' - spec: - project: default - sources: - - repoURL: https://example.chart - chart: example-app - targetRevision: "*" # This will fetch the latest chart, do not use it for production, specify a version - helm: - releaseName: "example-app" - valueFiles: - - $values/apps/helm/values/example-app/values-common.yml - - $values/apps/helm/values/example-app/env-type/values-no-prod.yml - # Cluster specific values are optional, they will override all the other values - - $values/apps/helm/values/example-app/clusters/values-{{ "{{" }}.metadata.labels.name{{ "}}" }}.yml - - # We can add some kubernetes manifests that are highly coupled with this Helm release, for example, a secret needed by this system tool to work (optional) - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - path: apps/kustomize/example-app/env-type/no-prod - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - ref: values - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: example - syncPolicy: - syncOptions: - - CreateNamespace=true - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-qa.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-qa.yml deleted file mode 100644 index 87b97f33d..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-qa.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Deploy a single application on all qa clusters. Note that by environments we mean entire clusters, not namespaces - -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: example-app - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - clusters: - selector: - matchExpressions: - - key: "qa" - operator: In - values: - - "true" - - syncPolicy: - preserveResourcesOnDeletion: true - template: - metadata: - name: 'example-app-{{ "{{" }}.nameNormalized{{ "}}" }}-qa' - spec: - project: default - sources: - - repoURL: https://example.chart - chart: example-app - targetRevision: "*" # This will fetch the latest chart, do not use it for production, specify a version - helm: - releaseName: "example-app-qa" - valueFiles: - - $values/apps/helm/values/example-app/values-common.yml - - $values/apps/helm/values/example-app/env-type/values-no-prod.yml - # If you have some image tag version that differ between environments - - $values/apps/helm/values/example-app/version/values-qa.yml - - $values/apps/helm/values/example-app/envs/values-qa.yml - # Cluster specific values are optional, they will override all the other values - - $values/apps/helm/values/example-app/clusters/values-{{ "{{" }}.metadata.labels.name{{ "}}" }}.yml - - - # We can add some kubernetes manifests that are highly coupled with this Helm release, for example, a secret needed by this system tool to work (optional) - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - path: apps/kustomize/example-app/envs/qa - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - ref: values - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: example - syncPolicy: - syncOptions: - - CreateNamespace=true - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-single-cluster.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-single-cluster.yml deleted file mode 100644 index fe03daef0..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/examples/helm-single-cluster.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Deploy a single application on a specific cluster. This should be an uncommon use case, as clusters should all -# be created in a similar way, with predefined structures (staging cluster, test cluster, production cluster) - -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: example-app - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - clusters: - selector: - matchLabels: - name: "" - - syncPolicy: - preserveResourcesOnDeletion: true - template: - metadata: - name: 'example-app-{{ "{{" }}.nameNormalized{{ "}}" }}' - spec: - project: default - sources: - - repoURL: https://example.chart - chart: example-app - targetRevision: "*" # This will fetch the latest chart, do not use it for production, specify a version - helm: - releaseName: "example-app" - valueFiles: - - $values/apps/helm/values/example-app/values-common.yml - - $values/apps/helm/values/example-app/clusters/values-{{ "{{" }}.metadata.labels.name{{ "}}" }}.yml - - # We can add some kubernetes manifests that are highly coupled with this Helm release, for example, a secret needed by this system tool to work (optional) - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - path: apps/kustomize/example-app/env-type/{{ "{{" }}.metadata.labels.type{{ "}}" }} - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - ref: values - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: example - syncPolicy: - syncOptions: - - CreateNamespace=true - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/ci-cd/argocd.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/ci-cd/argocd.yml new file mode 100644 index 000000000..7fc9ba3c0 --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/ci-cd/argocd.yml @@ -0,0 +1,57 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: argocd + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: [ "missingkey=error" ] + generators: + - matrix: + generators: + - clusters: + selector: + matchLabels: + type: "hub" + - git: + repoURL: #REPOURL + revision: HEAD + files: + - path: "apps/ci-cd/argocd/config/config-{{.metadata.labels.type}}.json" + + # If you want to delete everything if the Application is deleted, set this to false and then delete the Application. This is just a safeguard + syncPolicy: + preserveResourcesOnDeletion: true + template: + metadata: + name: '{{index .path.segments 2}}-{{.nameNormalized}}' + spec: + project: default + sources: + + - repoURL: '{{.chart.repo}}' + chart: '{{.chart.name}}' + targetRevision: '{{.chart.version}}' + helm: + releaseName: '{{.chart.releaseName}}' + valueFiles: + - $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-common.yml + - $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-{{.metadata.labels.type }}.yml + + - repoURL: #REPOURL + targetRevision: HEAD + path: apps/{{index .path.segments 1}}/{{index .path.segments 2}}/kustomize/overlays/{{ .metadata.labels.type }} + + - repoURL: #REPOURL + targetRevision: HEAD + ref: values + destination: + server: '{{.server}}' + namespace: '{{.namespace}}' + syncPolicy: + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + automated: + prune: true + selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/infra.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/infra.yml new file mode 100644 index 000000000..34aa742de --- /dev/null +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/hub/infra.yml @@ -0,0 +1,41 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: hub-infra + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: [ "missingkey=error" ] + generators: + - clusters: + selector: + matchLabels: + type: "hub" + + + # If you want to delete everything if the Application is deleted, set this to false and then delete the Application. This is just a safeguard + syncPolicy: + preserveResourcesOnDeletion: true + template: + metadata: + name: 'hub-infra' + spec: + project: default + sources: + - repoURL: #REPOURL + targetRevision: HEAD + path: infra/overlays/{{ .metadata.labels.type }} + + - repoURL: #REPOURL + targetRevision: HEAD + ref: values + destination: + server: '{{.server}}' + namespace: default + syncPolicy: + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + automated: + prune: true + selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/templates/argocd.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/templates/argocd.yml deleted file mode 100644 index f39cb2e39..000000000 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/appsets/templates/argocd.yml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: argocd - namespace: argocd -spec: - goTemplate: true - goTemplateOptions: [ "missingkey=error" ] - generators: - - clusters: - selector: - matchLabels: - type: "hub" - - syncPolicy: - preserveResourcesOnDeletion: true - template: - metadata: - name: 'argocd-{{ "{{" }}.nameNormalized{{ "}}" }}' - spec: - project: default - sources: - - repoURL: https://argoproj.github.io/argo-helm - chart: argo-cd - targetRevision: "*" - helm: - releaseName: "argo-alcampag" - valueFiles: - - $values/apps/helm/values/argocd/values-common.yml - - $values/apps/helm/values/argocd/env-type/values-{{ "{{" }}.metadata.labels.type{{ "}}" }}.yml - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - path: apps/kustomize/argocd/env-type/{{ "{{" }}.metadata.labels.type{{ "}}" }} - - - repoURL: {{ .Values.repo }} - targetRevision: HEAD - ref: values - destination: - server: '{{ "{{" }}.server{{ "}}" }}' - namespace: argocd - syncPolicy: - syncOptions: - - CreateNamespace=true - - ServerSideApply=true - automated: - prune: true - selfHeal: true \ No newline at end of file diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/root.yml b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/hub.yml similarity index 55% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/root.yml rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/hub.yml index 2b9ab8014..4939d4fd0 100644 --- a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/root.yml +++ b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/hub.yml @@ -1,20 +1,18 @@ -# Insert Git repository where the cluster configurations are located, with .git postfix. This template has to be applied manually +# Insert Git repository with .git postfix. This template has to be applied manually apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: system-cluster-config + name: hub-apps namespace: argocd spec: project: default source: - repoURL: ${REPO} + repoURL: #RepoURL targetRevision: HEAD - path: appsets - helm: - parameters: - - name: repo - value: ${REPO} + path: appsets/hub + directory: + recurse: true destination: server: https://kubernetes.default.svc namespace: argocd diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/templates/.gitkeep b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/infra/base/.gitkeep similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/appsets/templates/.gitkeep rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/infra/base/.gitkeep diff --git a/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/charts/.gitkeep b/app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/infra/overlays/hub/.gitkeep similarity index 100% rename from app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/helm/charts/.gitkeep rename to app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/infra/overlays/hub/.gitkeep From ae2f5a043074e1c9d07de70475f7986913bed19f Mon Sep 17 00:00:00 2001 From: alcampag Date: Thu, 9 Oct 2025 10:56:55 +0200 Subject: [PATCH 2/2] oke-gitops-1.1.1 --- app-dev/devops-and-containers/oke/oke-gitops/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-dev/devops-and-containers/oke/oke-gitops/README.md b/app-dev/devops-and-containers/oke/oke-gitops/README.md index d81c23d66..dd5e0c10f 100644 --- a/app-dev/devops-and-containers/oke/oke-gitops/README.md +++ b/app-dev/devops-and-containers/oke/oke-gitops/README.md @@ -139,7 +139,7 @@ This stack will: * Create 2 OCI Code Repositories: one with pipelines definitions, and another one called "oke-cluster-config" with the git template for the OKE cluster administrators * Create an OCI Build Pipeline that will mirror the ArgoCD Helm Chart inside the Oracle Cloud Registry, and deploy it in the chosen cluster -[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-gitops-1.1.0/stack.zip) +[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-gitops-1.1.1/stack.zip) Once the stack has been provisioned, you can modify the ArgoCD version to deploy by editing the `mirror_argo.yaml` file in the `pipelines` repository. By default, ArgoCD will be deployed in an "insecure" mode to disable the default SSL certificate, but feel free to modify the chart values in the `argo-cd-chart-values` artifact. \ No newline at end of file