From 88a32b4eac486bec221d9c7174fe06587439f6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cayeshasiddiqa161=E2=80=9D?= Date: Mon, 5 Jun 2023 21:30:22 +0500 Subject: [PATCH 1/2] argocd apps fixes --- .../configure-apps-gitops-repo.md | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md b/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md index 0b2598f3..524d5465 100644 --- a/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md +++ b/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md @@ -157,19 +157,21 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. └── stage ``` -1. Add ArgoCD applications for these environments (dev & stage) defined in `gabbar/argocd-apps`. These environment belong to specific cluster. - - Create dev and stage folders at `argocd-apps/` to represent dev and stage cluster. +1. Create **argocd-apps** folder at the root of your Apps GitOps repo. Create clusters folder containing the environments folder each cluster have. Add ArgoCD applications for these environments (dev & stage). ```bash ├── argocd-apps - ├── dev - └── stage + ├── cluster-1 + ├── dev + └── stage + ├── cluster-2 + ├── dev + └── stage ``` - > Folders in `argocd-apps` corresponds to clusters, these folder contain ArgoCD applications pointing to 1 or more environments inside multiple tenant folders per cluster, Folders in `gabbar/argocd-apps` correspond to environments. + > Folders in `argocd-apps` corresponds to clusters, these folders contain ArgoCD applications pointing to 1 or more environments inside multiple tenant folders per cluster. Folders in `gabbar/argocd-apps` correspond to environments. - Next, create the following ArgoCD applications: + Next, create the following ArgoCD applications in each environment, dev and stage: ```yaml # Name: gabbar-dev.yaml (TENANT_NAME-ENV_NAME.yaml) @@ -177,7 +179,7 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: + name: namespace: openshift-gitops spec: destination: @@ -185,7 +187,7 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. server: 'https://kubernetes.default.svc' project: gabbar source: - path: gabbar/argocd-apps/dev + path: argocd-apps/dev repoURL: 'APPS_GITOPS_REPO_URL' targetRevision: HEAD syncPolicy: @@ -206,7 +208,7 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. server: 'https://kubernetes.default.svc' project: gabbar source: - path: gabbar/argocd-apps/stage + path: argocd-apps/stage repoURL: 'APPS_GITOPS_REPO_URL' targetRevision: HEAD syncPolicy: @@ -237,7 +239,7 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. server: 'https://kubernetes.default.svc' project: root-tenant source: - path: gabbar/argocd-apps/dev + path: argocd-apps/dev repoURL: 'APPS_GITOPS_REPO_URL' targetRevision: HEAD syncPolicy: From 4c1b329c6f731f4a6026868c3d88165343b8c426 Mon Sep 17 00:00:00 2001 From: Ayesha Siddiqa <58335244+ayeshasiddiqa161@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:37:08 +0500 Subject: [PATCH 2/2] Update configure-apps-gitops-repo.md --- .../configure-apps-gitops-repo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md b/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md index 524d5465..4ddd0e74 100644 --- a/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md +++ b/content/for-delivery-engineers/tutorials/02-configure-apps-gitops-config/configure-apps-gitops-repo.md @@ -157,7 +157,7 @@ Lets proceed by adding a tenant to the `apps-gitops-config` repository. └── stage ``` -1. Create **argocd-apps** folder at the root of your Apps GitOps repo. Create clusters folder containing the environments folder each cluster have. Add ArgoCD applications for these environments (dev & stage). +1. Create `argocd-apps` folder at the root of your Apps GitOps repo. Create clusters folder containing the environments folder each cluster have. Add ArgoCD applications for these environments (dev & stage). ```bash ├── argocd-apps