From 51f4f78a32ed1e5803ae2c09b307d4cf5c1a4c0b Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 21 Jul 2022 23:03:15 -0700 Subject: [PATCH 01/37] fixing manifest errors --- argocd-definitions/dev/project.express.yaml | 29 ------------------- argocd-definitions/dev/project.nginx-pod.yaml | 29 ------------------- argocd-definitions/dev/project.trio.yaml | 29 ------------------- .../nginx-pod/{ => dev}/nginx-pod.yaml | 0 push/update-git-info-linux.sh | 21 ++++++++++++++ push/update-git-info-mac.sh | 21 ++++++++++++++ 6 files changed, 42 insertions(+), 87 deletions(-) delete mode 100644 argocd-definitions/dev/project.express.yaml delete mode 100644 argocd-definitions/dev/project.nginx-pod.yaml delete mode 100644 argocd-definitions/dev/project.trio.yaml rename k8s-resources/nginx-pod/{ => dev}/nginx-pod.yaml (100%) create mode 100755 push/update-git-info-linux.sh create mode 100755 push/update-git-info-mac.sh diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml deleted file mode 100644 index 24c1c32..0000000 --- a/argocd-definitions/dev/project.express.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: express - namespace: codefresh - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'express' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' diff --git a/argocd-definitions/dev/project.nginx-pod.yaml b/argocd-definitions/dev/project.nginx-pod.yaml deleted file mode 100644 index f38128d..0000000 --- a/argocd-definitions/dev/project.nginx-pod.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: nginx-pod - namespace: codefresh - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'nginx-pod' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' diff --git a/argocd-definitions/dev/project.trio.yaml b/argocd-definitions/dev/project.trio.yaml deleted file mode 100644 index afbd392..0000000 --- a/argocd-definitions/dev/project.trio.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: trio - namespace: codefresh - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'trio' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' diff --git a/k8s-resources/nginx-pod/nginx-pod.yaml b/k8s-resources/nginx-pod/dev/nginx-pod.yaml similarity index 100% rename from k8s-resources/nginx-pod/nginx-pod.yaml rename to k8s-resources/nginx-pod/dev/nginx-pod.yaml diff --git a/push/update-git-info-linux.sh b/push/update-git-info-linux.sh new file mode 100755 index 0000000..5cb6407 --- /dev/null +++ b/push/update-git-info-linux.sh @@ -0,0 +1,21 @@ +#!/bin/bash +echo "Enter git user name" + +read GIT_USER + +echo "Enter git repo name" + +read GIT_REPO + +for i in ../argocd-definitions/dev/app*; do + sed -i -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" $i +done + +#git add ../argocd-definitions/dev/app.*.yaml + +#git branch -M main + +#git commit -m "Update GITHUB_USER and GITHUB_REPO" + +#git push -u origin main + diff --git a/push/update-git-info-mac.sh b/push/update-git-info-mac.sh new file mode 100755 index 0000000..03bb555 --- /dev/null +++ b/push/update-git-info-mac.sh @@ -0,0 +1,21 @@ +#!/bin/bash +echo "Enter git user name" + +read GIT_USER + +echo "Enter git repo name" + +read GIT_REPO + +for i in ../argocd-definitions/dev/app*; do + sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/in-cluster/arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus/" $i +done + +git add ../argocd-definitions/dev/app* + +git branch -M main + +git commit -m "Update GITHUB_USER and GITHUB_REPO" + +git push -u origin main + From 5f9526af334581f5de000549232c243cb32558e7 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 21 Jul 2022 23:08:06 -0700 Subject: [PATCH 02/37] Update GITHUB_USER and GITHUB_REPO --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index befe006..ccf06c8 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -14,7 +14,7 @@ spec: project: express source: path: ./k8s-resources/express/overlays/dev - repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git + repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main syncPolicy: syncOptions: diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index b882b8b..c66e9e8 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -13,7 +13,7 @@ spec: name: CLUSTER_NAME project: nginx-pod source: - repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git + repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main path: ./k8s-resources/nginx-pod/dev syncPolicy: diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index d3259a6..900da5c 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -13,7 +13,7 @@ spec: name: CLUSTER_NAME project: trio source: - repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git + repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main path: ./k8s-resources/trio/dev helm: From dc406f0dc2a3ca24d76a52ce3181c576daf6e104 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 21 Jul 2022 23:16:02 -0700 Subject: [PATCH 03/37] Update GITHUB_USER and GITHUB_REPO --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index ccf06c8..751cff9 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ metadata: spec: destination: namespace: express-dev - name: CLUSTER_NAME + name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus project: express source: path: ./k8s-resources/express/overlays/dev diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index c66e9e8..bc41377 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -10,7 +10,7 @@ metadata: spec: destination: namespace: nginx-pod-dev - name: CLUSTER_NAME + name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus project: nginx-pod source: repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index 900da5c..a2e2286 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -10,7 +10,7 @@ metadata: spec: destination: namespace: trio-dev - name: CLUSTER_NAME + name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus project: trio source: repoURL: https://github.com/nightmar39/cd-five-mins.git From 313c4e4061bca345f81c8ab5a015c7b7f54ec902 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 21 Jul 2022 23:50:40 -0700 Subject: [PATCH 04/37] testing one application without the namespace specified --- argocd-definitions/dev/app.express.yaml | 1 - push/update-git-info-mac.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 751cff9..6101236 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: express-dev - namespace: codefresh labels: app: express-dev finalizers: diff --git a/push/update-git-info-mac.sh b/push/update-git-info-mac.sh index 03bb555..4273da3 100755 --- a/push/update-git-info-mac.sh +++ b/push/update-git-info-mac.sh @@ -7,11 +7,11 @@ echo "Enter git repo name" read GIT_REPO -for i in ../argocd-definitions/dev/app*; do - sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/in-cluster/arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus/" $i +for i in ./argocd-definitions/dev/app*; do + sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus/" $i done -git add ../argocd-definitions/dev/app* +git add ./argocd-definitions/dev/app* git branch -M main From 02b3e2bd90de49f8dd6d3ad17ef17557253030c8 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 21 Jul 2022 23:52:54 -0700 Subject: [PATCH 05/37] fixing other 2 --- argocd-definitions/dev/app.nginx-pod.yaml | 1 - argocd-definitions/dev/app.trio.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index bc41377..9ba9492 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: nginx-pod-dev - namespace: codefresh labels: app: nginx-pod-dev finalizers: diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index a2e2286..b526929 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: trio-dev - namespace: codefresh labels: app: trio-dev finalizers: From e6852aa810a16e8d2f9bad5478e345fe5628a075 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 00:00:10 -0700 Subject: [PATCH 06/37] adding self heal to see if it makes it do sync automatically --- argocd-definitions/dev/app.express.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 6101236..f53e77e 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -20,3 +20,4 @@ spec: - CreateNamespace=true automated: prune: true + selfHeal: true From 2aece30f76b117dc7b009ea353074e0960414a76 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 00:04:20 -0700 Subject: [PATCH 07/37] fixing project references --- argocd-definitions/dev/app.express.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index f53e77e..edd3dc1 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,6 @@ spec: destination: namespace: express-dev name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus - project: express source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git From 7a5e301b595d8f7a1497615f76609e4745b40424 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 00:14:30 -0700 Subject: [PATCH 08/37] fixing project references for all --- argocd-definitions/dev/app.nginx-pod.yaml | 1 - argocd-definitions/dev/app.trio.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 9ba9492..7e64418 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -10,7 +10,6 @@ spec: destination: namespace: nginx-pod-dev name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus - project: nginx-pod source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index b526929..b666b49 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -10,7 +10,6 @@ spec: destination: namespace: trio-dev name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus - project: trio source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main From 7c230c44f057af1ed1d3329bb6b3da50941d4748 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 10:33:04 -0700 Subject: [PATCH 09/37] adding project file to test --- argocd-definitions/dev/project.express.yaml | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 argocd-definitions/dev/project.express.yaml diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml new file mode 100644 index 0000000..78ddfd7 --- /dev/null +++ b/argocd-definitions/dev/project.express.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: express + namespace: codefresh + # Finalizer that ensures that project is not deleted until it is not referenced by any application + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # Project description + description: Deployment(s) of 'express' app + + # Allow manifests to deploy from any Git repos + sourceRepos: + - '*' + + # Permit applications to deploy to any namespace in any cluster + destinations: + - namespace: '*' + server: '*' + + # Permit cluster-scoped resources to be created + clusterResourceWhitelist: + - group: '*' + kind: '*' + + namespaceResourceWhitelist: + - group: '*' + kind: '*' \ No newline at end of file From b151a3b8562a7c8d91197ed9419d067f955a7224 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 10:48:45 -0700 Subject: [PATCH 10/37] updating project to existing one --- argocd-definitions/dev/app.express.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index edd3dc1..3767624 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -9,7 +9,8 @@ metadata: spec: destination: namespace: express-dev - name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus + name: us-support-v2-cluster + project: us-support-v2-cluster source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git From dab74e43e05f7096d8b3970f47d50ba3162ea141 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 10:58:28 -0700 Subject: [PATCH 11/37] pointing apps to default project --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 1 + argocd-definitions/dev/app.trio.yaml | 1 + argocd-definitions/dev/project.express.yaml | 29 --------------------- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 argocd-definitions/dev/project.express.yaml diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 3767624..74619cc 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ spec: destination: namespace: express-dev name: us-support-v2-cluster - project: us-support-v2-cluster + project: default source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 7e64418..9a15156 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -7,6 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: + project: default destination: namespace: nginx-pod-dev name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index b666b49..8bd36dc 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -7,6 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: + project: default destination: namespace: trio-dev name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml deleted file mode 100644 index 78ddfd7..0000000 --- a/argocd-definitions/dev/project.express.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: express - namespace: codefresh - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'express' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' \ No newline at end of file From 5e46a2f7168af6a1751defb512753d48464d62a2 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 11:26:05 -0700 Subject: [PATCH 12/37] adding a project to show error --- argocd-definitions/dev/project.express.yaml | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 argocd-definitions/dev/project.express.yaml diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml new file mode 100644 index 0000000..78ddfd7 --- /dev/null +++ b/argocd-definitions/dev/project.express.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: express + namespace: codefresh + # Finalizer that ensures that project is not deleted until it is not referenced by any application + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # Project description + description: Deployment(s) of 'express' app + + # Allow manifests to deploy from any Git repos + sourceRepos: + - '*' + + # Permit applications to deploy to any namespace in any cluster + destinations: + - namespace: '*' + server: '*' + + # Permit cluster-scoped resources to be created + clusterResourceWhitelist: + - group: '*' + kind: '*' + + namespaceResourceWhitelist: + - group: '*' + kind: '*' \ No newline at end of file From 83623a6d21d479ff1e90b509e113456ddb945558 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 12:17:19 -0700 Subject: [PATCH 13/37] removing namespace from project for testing --- argocd-definitions/dev/project.express.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml index 78ddfd7..a2fc379 100644 --- a/argocd-definitions/dev/project.express.yaml +++ b/argocd-definitions/dev/project.express.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: AppProject metadata: name: express - namespace: codefresh # Finalizer that ensures that project is not deleted until it is not referenced by any application finalizers: - resources-finalizer.argocd.argoproj.io From 0131e6d4eae2b1e83519be930f273938da2e29db Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 12:20:48 -0700 Subject: [PATCH 14/37] fixing cluster and pointing to custom project --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 4 ++-- argocd-definitions/dev/app.trio.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 74619cc..a579b1a 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ spec: destination: namespace: express-dev name: us-support-v2-cluster - project: default + project: express source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 9a15156..192246a 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -7,10 +7,10 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: default + project: express destination: namespace: nginx-pod-dev - name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus + name: us-support-v2-cluster source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index 8bd36dc..883078f 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -7,10 +7,10 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: default + project: express destination: namespace: trio-dev - name: arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus + name: us-support-v2-cluster source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main From 23b554f6976413a74646f322a84eb1363e2cd5b6 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 12:31:04 -0700 Subject: [PATCH 15/37] fixing nginx pod manifest --- k8s-resources/nginx-pod/dev/nginx-pod.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/k8s-resources/nginx-pod/dev/nginx-pod.yaml b/k8s-resources/nginx-pod/dev/nginx-pod.yaml index 2503f09..5c76606 100644 --- a/k8s-resources/nginx-pod/dev/nginx-pod.yaml +++ b/k8s-resources/nginx-pod/dev/nginx-pod.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Pod metadata: name: webserver - namespace: codefresh spec: containers: - name: webserver From 8816f80c8b9e1e4549c45f216ce6639a15aa0c94 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 12:38:28 -0700 Subject: [PATCH 16/37] fixing kustomize manifests --- k8s-resources/express/base/deployment.yaml | 1 - k8s-resources/express/base/service.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/k8s-resources/express/base/deployment.yaml b/k8s-resources/express/base/deployment.yaml index 1b1b452..0066e4a 100644 --- a/k8s-resources/express/base/deployment.yaml +++ b/k8s-resources/express/base/deployment.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: Deployment metadata: name: express-microservice - namespace: codefresh spec: replicas: 4 # revisionHistoryLimit>2 not supported right now diff --git a/k8s-resources/express/base/service.yaml b/k8s-resources/express/base/service.yaml index e554490..e1f0386 100644 --- a/k8s-resources/express/base/service.yaml +++ b/k8s-resources/express/base/service.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: express-active - namespace: codefresh spec: ports: - port: 80 From 827b320b3919eafd0a97aba294955bd3f4be0cf1 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 12:46:56 -0700 Subject: [PATCH 17/37] actually fixing kustomize errors --- k8s-resources/express/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/express/base/deployment.yaml b/k8s-resources/express/base/deployment.yaml index 0066e4a..66950b4 100644 --- a/k8s-resources/express/base/deployment.yaml +++ b/k8s-resources/express/base/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: argoproj.io/v1alpha1 +apiVersion: apps/v1 kind: Deployment metadata: name: express-microservice From 9a1a248381952fc6f7717e0bf402bdad02246975 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 13:15:58 -0700 Subject: [PATCH 18/37] adding other projects --- argocd-definitions/dev/project.nginx-pod.yaml | 29 +++++++++++++++++++ argocd-definitions/dev/project.trio.yaml | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 argocd-definitions/dev/project.nginx-pod.yaml create mode 100644 argocd-definitions/dev/project.trio.yaml diff --git a/argocd-definitions/dev/project.nginx-pod.yaml b/argocd-definitions/dev/project.nginx-pod.yaml new file mode 100644 index 0000000..b03fcde --- /dev/null +++ b/argocd-definitions/dev/project.nginx-pod.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: nginx-pod + namespace: codefresh + # Finalizer that ensures that project is not deleted until it is not referenced by any application + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # Project description + description: Deployment(s) of 'nginx-pod' app + + # Allow manifests to deploy from any Git repos + sourceRepos: + - '*' + + # Permit applications to deploy to any namespace in any cluster + destinations: + - namespace: '*' + server: '*' + + # Permit cluster-scoped resources to be created + clusterResourceWhitelist: + - group: '*' + kind: '*' + + namespaceResourceWhitelist: + - group: '*' + kind: '*' \ No newline at end of file diff --git a/argocd-definitions/dev/project.trio.yaml b/argocd-definitions/dev/project.trio.yaml new file mode 100644 index 0000000..c0744a5 --- /dev/null +++ b/argocd-definitions/dev/project.trio.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: trio + namespace: codefresh + # Finalizer that ensures that project is not deleted until it is not referenced by any application + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # Project description + description: Deployment(s) of 'trio' app + + # Allow manifests to deploy from any Git repos + sourceRepos: + - '*' + + # Permit applications to deploy to any namespace in any cluster + destinations: + - namespace: '*' + server: '*' + + # Permit cluster-scoped resources to be created + clusterResourceWhitelist: + - group: '*' + kind: '*' + + namespaceResourceWhitelist: + - group: '*' + kind: '*' \ No newline at end of file From bbe03ded631c59f26d5fed544fb01031daac8341 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 13:18:55 -0700 Subject: [PATCH 19/37] updating projects and apps --- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- argocd-definitions/dev/project.nginx-pod.yaml | 1 - argocd-definitions/dev/project.trio.yaml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 192246a..78b83d9 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: express + project: nginx-pod destination: namespace: nginx-pod-dev name: us-support-v2-cluster diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index 883078f..ea19bf2 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: express + project: trio destination: namespace: trio-dev name: us-support-v2-cluster diff --git a/argocd-definitions/dev/project.nginx-pod.yaml b/argocd-definitions/dev/project.nginx-pod.yaml index b03fcde..58bcd68 100644 --- a/argocd-definitions/dev/project.nginx-pod.yaml +++ b/argocd-definitions/dev/project.nginx-pod.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: AppProject metadata: name: nginx-pod - namespace: codefresh # Finalizer that ensures that project is not deleted until it is not referenced by any application finalizers: - resources-finalizer.argocd.argoproj.io diff --git a/argocd-definitions/dev/project.trio.yaml b/argocd-definitions/dev/project.trio.yaml index c0744a5..3321405 100644 --- a/argocd-definitions/dev/project.trio.yaml +++ b/argocd-definitions/dev/project.trio.yaml @@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1 kind: AppProject metadata: name: trio - namespace: codefresh # Finalizer that ensures that project is not deleted until it is not referenced by any application finalizers: - resources-finalizer.argocd.argoproj.io From f54994d740f21e52f42d5f61eec46441bebe575b Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 15:50:55 -0700 Subject: [PATCH 20/37] deleting projects, adding to git-sources proj --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index a579b1a..c120702 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ spec: destination: namespace: express-dev name: us-support-v2-cluster - project: express + project: git-sources source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 78b83d9..84bd978 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: nginx-pod + project: git-sources destination: namespace: nginx-pod-dev name: us-support-v2-cluster diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index ea19bf2..ea8bb49 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: trio + project: git-sources destination: namespace: trio-dev name: us-support-v2-cluster From a79cb792379fe44d6518789153b46e0f9f1d0a03 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 16:03:16 -0700 Subject: [PATCH 21/37] removed projects --- argocd-definitions/dev/project.express.yaml | 28 ------------------- argocd-definitions/dev/project.nginx-pod.yaml | 28 ------------------- argocd-definitions/dev/project.trio.yaml | 28 ------------------- 3 files changed, 84 deletions(-) delete mode 100644 argocd-definitions/dev/project.express.yaml delete mode 100644 argocd-definitions/dev/project.nginx-pod.yaml delete mode 100644 argocd-definitions/dev/project.trio.yaml diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml deleted file mode 100644 index a2fc379..0000000 --- a/argocd-definitions/dev/project.express.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: express - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'express' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' \ No newline at end of file diff --git a/argocd-definitions/dev/project.nginx-pod.yaml b/argocd-definitions/dev/project.nginx-pod.yaml deleted file mode 100644 index 58bcd68..0000000 --- a/argocd-definitions/dev/project.nginx-pod.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: nginx-pod - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'nginx-pod' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' \ No newline at end of file diff --git a/argocd-definitions/dev/project.trio.yaml b/argocd-definitions/dev/project.trio.yaml deleted file mode 100644 index 3321405..0000000 --- a/argocd-definitions/dev/project.trio.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: trio - # Finalizer that ensures that project is not deleted until it is not referenced by any application - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - # Project description - description: Deployment(s) of 'trio' app - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - # Permit applications to deploy to any namespace in any cluster - destinations: - - namespace: '*' - server: '*' - - # Permit cluster-scoped resources to be created - clusterResourceWhitelist: - - group: '*' - kind: '*' - - namespaceResourceWhitelist: - - group: '*' - kind: '*' \ No newline at end of file From 524b30ab613dd34d97d3c8ca14cebf1052ca6e88 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 16:07:38 -0700 Subject: [PATCH 22/37] updating manifests to update apps --- k8s-resources/express/base/deployment.yaml | 2 +- k8s-resources/nginx-pod/dev/nginx-pod.yaml | 4 ++-- k8s-resources/trio/dev/values.yaml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/k8s-resources/express/base/deployment.yaml b/k8s-resources/express/base/deployment.yaml index 66950b4..245a8af 100644 --- a/k8s-resources/express/base/deployment.yaml +++ b/k8s-resources/express/base/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: express-microservice spec: - replicas: 4 + replicas: 3 # revisionHistoryLimit>2 not supported right now revisionHistoryLimit: 2 selector: diff --git a/k8s-resources/nginx-pod/dev/nginx-pod.yaml b/k8s-resources/nginx-pod/dev/nginx-pod.yaml index 5c76606..00b8aee 100644 --- a/k8s-resources/nginx-pod/dev/nginx-pod.yaml +++ b/k8s-resources/nginx-pod/dev/nginx-pod.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Pod metadata: - name: webserver + name: webserver-nginx spec: containers: - - name: webserver + - name: webserver-nginx image: nginx:latest ports: - containerPort: 80 \ No newline at end of file diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 22a63d9..689fd34 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,15 +1,15 @@ buslog: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" ctrlr: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/ctrlr tag: "2b6d88e" flask-ui: - replicaCount: 3 + replicaCount: 2 image: repository: quay.io/codefresh_sa/flask-ui tag: "1b8d478" From 652e5ad31c50640d0a248cef7e93b594a0297755 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 16:13:41 -0700 Subject: [PATCH 23/37] testing different project names --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index c120702..3767624 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ spec: destination: namespace: express-dev name: us-support-v2-cluster - project: git-sources + project: us-support-v2-cluster source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 84bd978..7b25e1a 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: git-sources + project: default destination: namespace: nginx-pod-dev name: us-support-v2-cluster From 97ed2606cbc501c070482304d22ded17dea88c83 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Fri, 22 Jul 2022 16:16:59 -0700 Subject: [PATCH 24/37] all apps using default project --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 3767624..74619cc 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -10,7 +10,7 @@ spec: destination: namespace: express-dev name: us-support-v2-cluster - project: us-support-v2-cluster + project: default source: path: ./k8s-resources/express/overlays/dev repoURL: https://github.com/nightmar39/cd-five-mins.git diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index ea8bb49..4f58cc4 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -7,7 +7,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - project: git-sources + project: default destination: namespace: trio-dev name: us-support-v2-cluster From 86ea30303ea8fd440f3d546c3b4fe3c04f16e891 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Tue, 26 Jul 2022 22:42:25 -0700 Subject: [PATCH 25/37] Update GITHUB_USER and GITHUB_REPO --- argocd-definitions/dev/app.express.yaml | 2 +- argocd-definitions/dev/app.nginx-pod.yaml | 2 +- argocd-definitions/dev/app.trio.yaml | 2 +- push/update-git-info-linux.sh | 14 +++++++++----- push/update-git-info-mac.sh | 10 +++++++--- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml index 74619cc..024e84f 100644 --- a/argocd-definitions/dev/app.express.yaml +++ b/argocd-definitions/dev/app.express.yaml @@ -9,7 +9,7 @@ metadata: spec: destination: namespace: express-dev - name: us-support-v2-cluster + name: docker-ngrok project: default source: path: ./k8s-resources/express/overlays/dev diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml index 7b25e1a..b96b464 100644 --- a/argocd-definitions/dev/app.nginx-pod.yaml +++ b/argocd-definitions/dev/app.nginx-pod.yaml @@ -10,7 +10,7 @@ spec: project: default destination: namespace: nginx-pod-dev - name: us-support-v2-cluster + name: docker-ngrok source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml index 4f58cc4..9bfe197 100644 --- a/argocd-definitions/dev/app.trio.yaml +++ b/argocd-definitions/dev/app.trio.yaml @@ -10,7 +10,7 @@ spec: project: default destination: namespace: trio-dev - name: us-support-v2-cluster + name: docker-ngrok source: repoURL: https://github.com/nightmar39/cd-five-mins.git targetRevision: main diff --git a/push/update-git-info-linux.sh b/push/update-git-info-linux.sh index 5cb6407..5186038 100755 --- a/push/update-git-info-linux.sh +++ b/push/update-git-info-linux.sh @@ -7,15 +7,19 @@ echo "Enter git repo name" read GIT_REPO +echo "Enter Managed Cluster name" + +read MANAGED_CLUSTER + for i in ../argocd-definitions/dev/app*; do - sed -i -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" $i + sed -i -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i done -#git add ../argocd-definitions/dev/app.*.yaml +git add ./argocd-definitions/dev/app* -#git branch -M main +git branch -M hosted-demo -#git commit -m "Update GITHUB_USER and GITHUB_REPO" +git commit -m "Update GITHUB_USER, GITHUB_REPO and CLUSTER_NAME" -#git push -u origin main +git push -u origin hosted-demo diff --git a/push/update-git-info-mac.sh b/push/update-git-info-mac.sh index 4273da3..c2e40c4 100755 --- a/push/update-git-info-mac.sh +++ b/push/update-git-info-mac.sh @@ -7,15 +7,19 @@ echo "Enter git repo name" read GIT_REPO +echo "Enter the name of your managed cluster" + +read MANAGED_CLUSTER + for i in ./argocd-definitions/dev/app*; do - sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/arn-aws-eks-us-east-2-835357571861-cluster-us-support-v2-clus/" $i + sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i done git add ./argocd-definitions/dev/app* -git branch -M main +git branch -M hosted-demo git commit -m "Update GITHUB_USER and GITHUB_REPO" -git push -u origin main +git push -u origin hosted-demo From c95351c7414d338d0150c23ab54d15f2ea6a983f Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 11:39:28 -0700 Subject: [PATCH 26/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 689fd34..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 11fe2edbb2c14d3675b2e590927744be23633c0d Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 13:56:36 -0700 Subject: [PATCH 27/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index b8616be..689fd34 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 734c41827f5b9979ffb83814146234e7ba865345 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 13:58:31 -0700 Subject: [PATCH 28/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 689fd34..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 7a791272678569a65d1459508f6ec0ed7c8656d0 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 17:33:53 -0700 Subject: [PATCH 29/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index b8616be..689fd34 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 194a8beb7d243cf6b978c8d16fe4007612f4a7c9 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 17:51:24 -0700 Subject: [PATCH 30/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 689fd34..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 2d31fc67e1e6c1f282a09716b032080e19b784f6 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:32:51 -0700 Subject: [PATCH 31/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index b8616be..689fd34 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 1f1c0774478d6e8d0b870873961a7e1395b56a41 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:29:57 -0700 Subject: [PATCH 32/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 689fd34..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From f2550250c20322e35ce39b311fdbb5bacd8c6bd0 Mon Sep 17 00:00:00 2001 From: nightmar39 Date: Thu, 28 Jul 2022 19:42:08 -0700 Subject: [PATCH 33/37] testing a push to a different folder --- k8s-resources/express/overlays/dev/kustomization.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s-resources/express/overlays/dev/kustomization.yaml b/k8s-resources/express/overlays/dev/kustomization.yaml index cf7a1fa..2c14b4d 100644 --- a/k8s-resources/express/overlays/dev/kustomization.yaml +++ b/k8s-resources/express/overlays/dev/kustomization.yaml @@ -6,3 +6,6 @@ resources: images: - name: quay.io/codefresh_sa/express newTag: "5416e81" +replicas: +- name: express-microservice + count: 2 From f70e3a527696bd9d7118f1f19b82d0ae60eb3318 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:43:17 -0700 Subject: [PATCH 34/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index b8616be..02b096c 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -9,7 +9,7 @@ ctrlr: repository: quay.io/codefresh_sa/ctrlr tag: "2b6d88e" flask-ui: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/flask-ui tag: "1b8d478" From 7996eea2eb02e96c3fc200d9bc8574daaae59a8d Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:43:45 -0700 Subject: [PATCH 35/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 02b096c..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -9,7 +9,7 @@ ctrlr: repository: quay.io/codefresh_sa/ctrlr tag: "2b6d88e" flask-ui: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/flask-ui tag: "1b8d478" From c038b12436ffc2ddcb41ed270afe2d526893d7d4 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:51:01 -0700 Subject: [PATCH 36/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index b8616be..689fd34 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 2 + replicaCount: 1 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59" From 7ebb7268d3c2004bf0f6c268e72c0414066722e5 Mon Sep 17 00:00:00 2001 From: Anthony Rozario <59712821+nightmar39@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:55:52 -0700 Subject: [PATCH 37/37] Update values.yaml --- k8s-resources/trio/dev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml index 689fd34..b8616be 100644 --- a/k8s-resources/trio/dev/values.yaml +++ b/k8s-resources/trio/dev/values.yaml @@ -1,5 +1,5 @@ buslog: - replicaCount: 1 + replicaCount: 2 image: repository: quay.io/codefresh_sa/buslog tag: "4ed1e59"