Merge pull request #2184 from oracle-devrel/oke-gitops

Oke gitops 1.1.2

Author: johnkarasoulos

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.1/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.2/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.

app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-hub.json

@@ -3,7 +3,7 @@
     "repo": "https://example-app/chart",
     "name": "app",
     "version": "*",
-    "release-name": "example-app"
+    "releaseName": "example-app"
   },
   "namespace": "default"
 }

app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/config/config-prod.json

@@ -3,7 +3,7 @@
     "repo": "https://example-app/chart",
     "name": "app",
     "version": "1.0.0",
-    "release-name": "example-app"
+    "releaseName": "example-app"
   },
   "namespace": "default"
 }

app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/clusters/values-in-cluster.yml renamed to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/hub/values.yml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  name: example-app
+  name: example-app-hub
   namespace: argocd
 spec:
   goTemplate: true
@@ -36,7 +36,7 @@ spec:
             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
+              - $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/{{.metadata.labels.type}}/values.yml
 
         - repoURL: #REPOURL
           targetRevision: HEAD

app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-no-prod.yml renamed to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/no-prod/values.yml

@@ -24,8 +24,9 @@ Under `Settings --> Repositories` click on **CONNECT REPO** and select to connec
 Fill the form with the following values:
 1. `Repository type`: "git"
 2. `Repository URL`: <oke-cluster-config clone URL>
-3. `Username`: \<OCI username of a user with access to the git repository>
-4. `Password`: \<Auth Token of the user>
+3. `Project`. "None" (leave blank)
+4. `Username`: \<OCI username of a user with access to the git repository>
+5. `Password`: \<Auth Token of the user>
 
 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.
@@ -64,7 +65,7 @@ This repository organizes configurations to install tools and configure clusters
 ## Repository Structure
 
 ```
-repos/system-cluster-config/
+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

app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/apps/app-category/example-app/helm/values/values-prod.yml renamed to app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/app-category/example-app/helm/values/prod/values.yml

@@ -3,7 +3,7 @@
     "repo": "https://example-app/chart",
     "name": "app",
     "version": "*",
-    "release-name": "example-app"
+    "releaseName": "example-app"
   },
   "namespace": "default"
 }