Skip to content

Commit fa3c1b7

Browse files
committed
oke-rm-1.1.7
1 parent ebfda27 commit fa3c1b7

File tree

29 files changed

+1776
-12
lines changed

29 files changed

+1776
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"repo": "https://example-app/chart",
44
"name": "app",
55
"version": "*",
6-
"release-name": "example-app"
6+
"releaseName": "example-app"
77
},
88
"namespace": "default"
99
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"repo": "https://example-app/chart",
44
"name": "app",
55
"version": "1.0.0",
6-
"release-name": "example-app"
6+
"releaseName": "example-app"
77
},
88
"namespace": "default"
99
}

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: argoproj.io/v1alpha1
22
kind: ApplicationSet
33
metadata:
4-
name: example-app
4+
name: example-app-hub
55
namespace: argocd
66
spec:
77
goTemplate: true
@@ -36,7 +36,7 @@ spec:
3636
releaseName: '{{.chart.releaseName}}'
3737
valueFiles:
3838
- $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-common.yml
39-
- $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/values-{{.metadata.labels.type }}.yml
39+
- $values/apps/{{index .path.segments 1}}/{{index .path.segments 2}}/helm/values/{{.metadata.labels.type}}/values.yml
4040

4141
- repoURL: #REPOURL
4242
targetRevision: HEAD

app-dev/devops-and-containers/oke/oke-gitops/repos/system-cluster-config/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ Under `Settings --> Repositories` click on **CONNECT REPO** and select to connec
2424
Fill the form with the following values:
2525
1. `Repository type`: "git"
2626
2. `Repository URL`: <oke-cluster-config clone URL>
27-
3. `Username`: \<OCI username of a user with access to the git repository>
28-
4. `Password`: \<Auth Token of the user>
27+
3. `Project`. "None" (leave blank)
28+
4. `Username`: \<OCI username of a user with access to the git repository>
29+
5. `Password`: \<Auth Token of the user>
2930

3031
The repository we want to connect to is the system-cluster-config repository in OCI DevOps, already created by the Resource Manager Stack.
3132
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
6465
## Repository Structure
6566

6667
```
67-
repos/system-cluster-config/
68+
system-cluster-config/
6869
├── hub.yml # ArgoCD Application to deploy ApplicationSets to the hub cluster
6970
├── in-cluster.yml # Secret defining the hub cluster itself
7071
├── apps/ # Application definitions, organized by category

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"repo": "https://example-app/chart",
44
"name": "app",
55
"version": "*",
6-
"release-name": "example-app"
6+
"releaseName": "example-app"
77
},
88
"namespace": "default"
99
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"repo": "https://example-app/chart",
44
"name": "app",
55
"version": "1.0.0",
6-
"release-name": "example-app"
6+
"releaseName": "example-app"
77
},
88
"namespace": "default"
99
}

0 commit comments

Comments
 (0)