From f3e0af96c6e205fe51ab6900b356356d29a0b5f0 Mon Sep 17 00:00:00 2001 From: Christian Schlatter Date: Tue, 21 Sep 2021 09:14:49 +0200 Subject: [PATCH 1/5] add child apps --- app-of-apps/app1.yaml | 16 ++++++++++++++++ app-of-apps/app1/deployment.yaml | 20 ++++++++++++++++++++ app-of-apps/app2.yaml | 16 ++++++++++++++++ app-of-apps/app2/deployment.yaml | 20 ++++++++++++++++++++ app-of-apps/app3.yaml | 16 ++++++++++++++++ app-of-apps/app3/deployment.yaml | 20 ++++++++++++++++++++ 6 files changed, 108 insertions(+) create mode 100644 app-of-apps/app1.yaml create mode 100644 app-of-apps/app1/deployment.yaml create mode 100644 app-of-apps/app2.yaml create mode 100644 app-of-apps/app2/deployment.yaml create mode 100644 app-of-apps/app3.yaml create mode 100644 app-of-apps/app3/deployment.yaml diff --git a/app-of-apps/app1.yaml b/app-of-apps/app1.yaml new file mode 100644 index 0000000..81b8fa8 --- /dev/null +++ b/app-of-apps/app1.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: app-of-apps-1 + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: default + name: in-cluster + project: default + source: + path: example-app + repoURL: https://github.com/acend/argocd-training + targetRevision: HEAD \ No newline at end of file diff --git a/app-of-apps/app1/deployment.yaml b/app-of-apps/app1/deployment.yaml new file mode 100644 index 0000000..6c76205 --- /dev/null +++ b/app-of-apps/app1/deployment.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: app-of-apps-1 +spec: + replicas: 1 + revisionHistoryLimit: 3 + selector: + matchLabels: + app: app-of-apps-1 + template: + metadata: + labels: + app: app-of-apps-1 + spec: + containers: + - image: quay.io/acend/example-web-go + name: app-of-apps-1 + ports: + - containerPort: 5000 \ No newline at end of file diff --git a/app-of-apps/app2.yaml b/app-of-apps/app2.yaml new file mode 100644 index 0000000..b4ebf20 --- /dev/null +++ b/app-of-apps/app2.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: app-of-apps-3 + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: default + name: in-cluster + project: default + source: + path: example-app + repoURL: https://github.com/acend/argocd-training + targetRevision: HEAD \ No newline at end of file diff --git a/app-of-apps/app2/deployment.yaml b/app-of-apps/app2/deployment.yaml new file mode 100644 index 0000000..ab1f7cd --- /dev/null +++ b/app-of-apps/app2/deployment.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: app-of-apps-2 +spec: + replicas: 1 + revisionHistoryLimit: 3 + selector: + matchLabels: + app: app-of-apps-2 + template: + metadata: + labels: + app: app-of-apps-2 + spec: + containers: + - image: quay.io/acend/example-web-go + name: app-of-apps-2 + ports: + - containerPort: 5000 \ No newline at end of file diff --git a/app-of-apps/app3.yaml b/app-of-apps/app3.yaml new file mode 100644 index 0000000..b4ebf20 --- /dev/null +++ b/app-of-apps/app3.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: app-of-apps-3 + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: default + name: in-cluster + project: default + source: + path: example-app + repoURL: https://github.com/acend/argocd-training + targetRevision: HEAD \ No newline at end of file diff --git a/app-of-apps/app3/deployment.yaml b/app-of-apps/app3/deployment.yaml new file mode 100644 index 0000000..a73d543 --- /dev/null +++ b/app-of-apps/app3/deployment.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: app-of-apps-3 +spec: + replicas: 1 + revisionHistoryLimit: 3 + selector: + matchLabels: + app: app-of-apps-3 + template: + metadata: + labels: + app: app-of-apps-3 + spec: + containers: + - image: quay.io/acend/example-web-go + name: app-of-apps-3 + ports: + - containerPort: 5000 \ No newline at end of file From 8811817078b4a874dcfe4f55c7d822d4490f333d Mon Sep 17 00:00:00 2001 From: Christian Schlatter Date: Tue, 21 Sep 2021 10:20:21 +0200 Subject: [PATCH 2/5] init app of apps example direcotry --- app-of-apps/apps/app1.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app-of-apps/apps/app1.yaml diff --git a/app-of-apps/apps/app1.yaml b/app-of-apps/apps/app1.yaml new file mode 100644 index 0000000..29ce5d5 --- /dev/null +++ b/app-of-apps/apps/app1.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: app-of-apps-1 + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: default + name: in-cluster + project: default + source: + path: app-of-apps/app1 + repoURL: https://github.com/acend/argocd-training + targetRevision: HEAD \ No newline at end of file From 1402d704e967ca91a2141dae5a83572c09820d96 Mon Sep 17 00:00:00 2001 From: Christian Schlatter Date: Tue, 21 Sep 2021 10:45:35 +0200 Subject: [PATCH 3/5] add app of apps --- app-of-apps/app1.yaml | 16 ---------------- app-of-apps/{ => apps}/app2.yaml | 2 +- app-of-apps/{ => apps}/app3.yaml | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 app-of-apps/app1.yaml rename app-of-apps/{ => apps}/app2.yaml (92%) rename app-of-apps/{ => apps}/app3.yaml (92%) diff --git a/app-of-apps/app1.yaml b/app-of-apps/app1.yaml deleted file mode 100644 index 81b8fa8..0000000 --- a/app-of-apps/app1.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-of-apps-1 - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: default - name: in-cluster - project: default - source: - path: example-app - repoURL: https://github.com/acend/argocd-training - targetRevision: HEAD \ No newline at end of file diff --git a/app-of-apps/app2.yaml b/app-of-apps/apps/app2.yaml similarity index 92% rename from app-of-apps/app2.yaml rename to app-of-apps/apps/app2.yaml index b4ebf20..0c6d29c 100644 --- a/app-of-apps/app2.yaml +++ b/app-of-apps/apps/app2.yaml @@ -11,6 +11,6 @@ spec: name: in-cluster project: default source: - path: example-app + path: app-of-apps/app2 repoURL: https://github.com/acend/argocd-training targetRevision: HEAD \ No newline at end of file diff --git a/app-of-apps/app3.yaml b/app-of-apps/apps/app3.yaml similarity index 92% rename from app-of-apps/app3.yaml rename to app-of-apps/apps/app3.yaml index b4ebf20..357666f 100644 --- a/app-of-apps/app3.yaml +++ b/app-of-apps/apps/app3.yaml @@ -11,6 +11,6 @@ spec: name: in-cluster project: default source: - path: example-app + path: app-of-apps/app3 repoURL: https://github.com/acend/argocd-training targetRevision: HEAD \ No newline at end of file From 3493dc5447bca21b9f36a7368604c5ee8a0533c1 Mon Sep 17 00:00:00 2001 From: Christian Schlatter Date: Tue, 21 Sep 2021 11:08:24 +0200 Subject: [PATCH 4/5] fix app2 --- app-of-apps/apps/app2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-of-apps/apps/app2.yaml b/app-of-apps/apps/app2.yaml index 0c6d29c..bfe1f04 100644 --- a/app-of-apps/apps/app2.yaml +++ b/app-of-apps/apps/app2.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: app-of-apps-3 + name: app-of-apps-2 namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io From 1d191b67e850af73c0ea6452a6f6e38bc0878387 Mon Sep 17 00:00:00 2001 From: Christian Schlatter Date: Tue, 21 Sep 2021 11:13:40 +0200 Subject: [PATCH 5/5] change application namespace --- app-of-apps/apps/app1.yaml | 2 +- app-of-apps/apps/app2.yaml | 2 +- app-of-apps/apps/app3.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-of-apps/apps/app1.yaml b/app-of-apps/apps/app1.yaml index 29ce5d5..2e12d0d 100644 --- a/app-of-apps/apps/app1.yaml +++ b/app-of-apps/apps/app1.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: app-of-apps-1 - namespace: argocd + namespace: pitc-infra-argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: diff --git a/app-of-apps/apps/app2.yaml b/app-of-apps/apps/app2.yaml index bfe1f04..fe7ea20 100644 --- a/app-of-apps/apps/app2.yaml +++ b/app-of-apps/apps/app2.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: app-of-apps-2 - namespace: argocd + namespace: pitc-infra-argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: diff --git a/app-of-apps/apps/app3.yaml b/app-of-apps/apps/app3.yaml index 357666f..3d549d7 100644 --- a/app-of-apps/apps/app3.yaml +++ b/app-of-apps/apps/app3.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: app-of-apps-3 - namespace: argocd + namespace: pitc-infra-argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: