Skip to content

Commit

Permalink
Merge pull request #3 from otp-gitops-2/master
Browse files Browse the repository at this point in the history
add submariner argo apps
  • Loading branch information
rampadc authored Jan 6, 2022
2 parents 229c972 + 283e6fa commit cb0dea4
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 9 deletions.
2 changes: 1 addition & 1 deletion 0-bootstrap/single-cluster/1-infra/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ patches:
patch: |-
- op: add
path: /spec/source/repoURL
value: https://github.com/rampadc/otp-gitops-infra.git
value: https://github.com/otp-gitops-2/otp-gitops-infra.git
- op: add
path: /spec/source/targetRevision
value: master
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: apps-cluster-add-managed-clusterset
annotations:
argocd.argoproj.io/sync-wave: "410"
labels:
gitops.tier.layer: applications
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: openshift-gitops
server: https://kubernetes.default.svc
project: applications
source:
path: clusters/submariner/add-clusters/
# so using app of apps we declare the actual resources in otp-gitops-apps??
syncPolicy:
automated:
prune: true
selfHeal: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: apps-create-managed-clusterset
annotations:
argocd.argoproj.io/sync-wave: "400"
labels:
gitops.tier.layer: applications
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: openshift-gitops
server: https://kubernetes.default.svc
project: applications
source:
path: clusters/submariner/create-managed-clusterset/
# declare resources in ottp-gitops-apps?

syncPolicy:
automated:
prune: true
selfHeal: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: apps-cluster-deploy-submariner
annotations:
argocd.argoproj.io/sync-wave: "415"
labels:
gitops.tier.layer: applications
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
destination:
namespace: openshift-gitops
server: https://kubernetes.default.svc
project: applications
source:
path: clusters/submariner/deploy-submariner/
syncPolicy:
automated:
prune: true
selfHeal: true
6 changes: 5 additions & 1 deletion 0-bootstrap/single-cluster/3-apps/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resources:
## Enable RHACM to install OpenShift GitOps on Managed Clusters for "Last Mile" Configuration
- argocd/managed-openshift-gitops/managed-openshift-gitops.yaml
# - argocd/managed-openshift-gitops/managed-openshift-gitops.yaml

## Create Pipelines
# - argocd/pipelines/tekton-mcm-gitops.yaml
Expand Down Expand Up @@ -37,6 +37,10 @@ resources:
## Create Instana Virtual Machines
#- argocd/infra/virtual-machines/instana/instana-vm.yaml

- argocd/clusters/submariner/create-managed-clusterset.yaml
- argocd/clusters/submariner/add-clusters-to-clusterset.yaml
- argocd/clusters/submariner/deploy-submariner.yaml

## Deploy Applications to Managed Clusters
## Include the Applications you wish to deploy below
## An example has been provided
Expand Down
14 changes: 7 additions & 7 deletions 0-bootstrap/single-cluster/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ patches:
patch: |-
- op: add
path: /spec/source/repoURL
value: https://github.com/rampadc/otp-gitops.git
value: https://github.com/otp-gitops-2/otp-gitops.git
- op: add
path: /spec/source/targetRevision
value: master
Expand All @@ -28,29 +28,29 @@ patches:
patch: |-
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops.git
value: https://github.com/otp-gitops-2/otp-gitops.git
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops-infra.git
value: https://github.com/otp-gitops-2/otp-gitops-infra.git
- target:
group: argoproj.io
kind: AppProject
labelSelector: "gitops.tier.layer=services"
patch: |-
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops.git
value: https://github.com/otp-gitops-2/otp-gitops.git
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops-services.git
value: https://github.com/otp-gitops-2/otp-gitops-services.git
- target:
group: argoproj.io
kind: AppProject
labelSelector: "gitops.tier.layer=applications"
patch: |-
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops.git
value: https://github.com/otp-gitops-2/otp-gitops.git
- op: add
path: /spec/sourceRepos/-
value: https://github.com/rampadc/otp-gitops-apps.git
value: https://github.com/otp-gitops-2/otp-gitops-apps.git
11 changes: 11 additions & 0 deletions setup/ocp/otp-gitops-repo-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
kind: Secret
metadata:
name: otp-gitops-repo-secret
namespace: openshift-gitops
labels:
argocd.argoproj.io/secret-type: repository
stringData:
url: https://github.com/rampadc/otp-gitops
password: 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
username: not-used

0 comments on commit cb0dea4

Please sign in to comment.