From 28b31cf17ac54ba1bf619975402b4b841e4f0864 Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 06:44:06 +0000 Subject: [PATCH 01/10] Test commit --- test_file | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test_file diff --git a/test_file b/test_file new file mode 100644 index 000000000..e69de29bb From cf6cb7a7acf2078e8ef40e2b1146f7fa6743c05a Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 06:44:33 +0000 Subject: [PATCH 02/10] Remove test file --- test_file | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test_file diff --git a/test_file b/test_file deleted file mode 100644 index e69de29bb..000000000 From 9c27909dbe0723497f04fb8b0ef9ed6479691dfb Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 07:36:47 +0000 Subject: [PATCH 03/10] update replica to 3 --- .../manifests/argocdmanifests/bookinfoArgoManifest.yaml | 6 +++--- welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/welcome/app/fe/bookinfo/manifests/argocdmanifests/bookinfoArgoManifest.yaml b/welcome/app/fe/bookinfo/manifests/argocdmanifests/bookinfoArgoManifest.yaml index adb1337c5..69ec9d095 100644 --- a/welcome/app/fe/bookinfo/manifests/argocdmanifests/bookinfoArgoManifest.yaml +++ b/welcome/app/fe/bookinfo/manifests/argocdmanifests/bookinfoArgoManifest.yaml @@ -6,7 +6,7 @@ metadata: spec: project: default source: - repoURL: 'https://github.com/yourusername/yourrepository' + repoURL: 'https://github.com/ankitsingh16391/devopshift-welcome' path: ./welcome/app/fe/bookinfo/manifests/manual targetRevision: argocd-workshop destination: @@ -16,8 +16,8 @@ spec: automated: prune: true selfHeal: true - syncOptions: - - CreateNamespace=true + syncOptions: + - CreateNamespace=true # webhook: # github: # secret: webhook-secret diff --git a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml index a0154c26b..98efa73d4 100644 --- a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml +++ b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml @@ -30,7 +30,7 @@ metadata: app: details version: v1 spec: - replicas: 1 + replicas: 3 selector: matchLabels: app: details From 23de3e62883a74420955baa30cee020010ac1986 Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 07:42:41 +0000 Subject: [PATCH 04/10] Replica 2 --- welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml index 98efa73d4..eade40400 100644 --- a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml +++ b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml @@ -30,7 +30,7 @@ metadata: app: details version: v1 spec: - replicas: 3 + replicas: 2 selector: matchLabels: app: details From ef0d58c5de2a498bf4f8588ca6545a6195e7e15b Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 07:49:05 +0000 Subject: [PATCH 05/10] updated by yaniv --- .gitignore | 1 + welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4adb0c2b6..1ad625b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ keys/ keys/ +keys/ diff --git a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml index eade40400..63b8af8a6 100644 --- a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml +++ b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml @@ -30,7 +30,7 @@ metadata: app: details version: v1 spec: - replicas: 2 + replicas: 5 selector: matchLabels: app: details From 282d69d722b4358c17e33a0edfaf367bafef6b0b Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 08:17:55 +0000 Subject: [PATCH 06/10] replica again to 1 --- welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml index 63b8af8a6..a0154c26b 100644 --- a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml +++ b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml @@ -30,7 +30,7 @@ metadata: app: details version: v1 spec: - replicas: 5 + replicas: 1 selector: matchLabels: app: details From d89a1fe50578b46153345bb428ba9ee268878233 Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 08:24:44 +0000 Subject: [PATCH 07/10] chnage to 3 --- welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml index a0154c26b..98efa73d4 100644 --- a/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml +++ b/welcome/app/fe/bookinfo/manifests/manual/bookinfo.yaml @@ -30,7 +30,7 @@ metadata: app: details version: v1 spec: - replicas: 1 + replicas: 3 selector: matchLabels: app: details From 28a661cf707cc60abea0b9a7b04ee7f80d48ca0c Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 09:49:23 +0000 Subject: [PATCH 08/10] replica counts for each service --- .../helm/bookinfo-chart/templates/details-microservice.yaml | 2 +- .../bookinfo-chart/templates/productpage-microservice.yaml | 2 +- .../helm/bookinfo-chart/templates/ratings-microservice.yaml | 2 +- .../helm/bookinfo-chart/templates/reviews-microservice.yaml | 2 +- .../fe/bookinfo/manifests/helm/bookinfo-chart/values.yaml | 6 +++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/details-microservice.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/details-microservice.yaml index fede9d8f0..6c709e0d1 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/details-microservice.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/details-microservice.yaml @@ -27,7 +27,7 @@ metadata: app: details version: v1 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.details.replicaCount }} selector: matchLabels: app: details diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/productpage-microservice.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/productpage-microservice.yaml index bb006d692..d6591cff0 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/productpage-microservice.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/productpage-microservice.yaml @@ -29,7 +29,7 @@ metadata: app: productpage version: v1 spec: - replicas: 3 + replicas: {{ .Values.productpage.replicaCount }} selector: matchLabels: app: productpage diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/ratings-microservice.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/ratings-microservice.yaml index 60c7c8f55..af58c3c05 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/ratings-microservice.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/ratings-microservice.yaml @@ -27,7 +27,7 @@ metadata: app: ratings version: v1 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.ratings.replicaCount }} selector: matchLabels: app: ratings diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml index e34a6e5bb..c6a1a9c8b 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml @@ -27,7 +27,7 @@ metadata: app: reviews version: v1 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.reviews.replicaCount }} selector: matchLabels: app: reviews diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/values.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/values.yaml index 0d883bb40..0bb5b1326 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/values.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/values.yaml @@ -1,4 +1,4 @@ -replicaCount: 1 + image: tag: 1.19.1 @@ -6,15 +6,19 @@ image: details: image: docker.io/istio/examples-bookinfo-details-v1 + replicaCount: 1 ratings: image: docker.io/istio/examples-bookinfo-ratings-v1 + replicaCount: 2 reviews: image: docker.io/istio/examples-bookinfo-reviews-v1 + replicaCount: 3 productpage: image: docker.io/istio/examples-bookinfo-productpage-v1 + replicaCount: 4 service: type: LoadBalancer From e7cc2c979459ddf5dc6811f53b1483cb7b9c7431 Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 09:51:27 +0000 Subject: [PATCH 09/10] update for all review version --- .../helm/bookinfo-chart/templates/reviews-microservice.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml index c6a1a9c8b..c355aeb20 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/bookinfo-chart/templates/reviews-microservice.yaml @@ -67,7 +67,7 @@ metadata: app: reviews version: v2 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.reviews.replicaCount }} selector: matchLabels: app: reviews @@ -107,7 +107,7 @@ metadata: app: reviews version: v3 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.reviews.replicaCount }} selector: matchLabels: app: reviews From 28efeb7e21c4dfcf4f153823228defac0cd02ed6 Mon Sep 17 00:00:00 2001 From: yaniv cohen Date: Thu, 11 Jul 2024 10:07:27 +0000 Subject: [PATCH 10/10] Update sync policy --- .../bookinfo/manifests/helm/argocd-bookinfo-chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/app/fe/bookinfo/manifests/helm/argocd-bookinfo-chart/values.yaml b/welcome/app/fe/bookinfo/manifests/helm/argocd-bookinfo-chart/values.yaml index 8bbb3e759..b26543c42 100644 --- a/welcome/app/fe/bookinfo/manifests/helm/argocd-bookinfo-chart/values.yaml +++ b/welcome/app/fe/bookinfo/manifests/helm/argocd-bookinfo-chart/values.yaml @@ -9,5 +9,5 @@ argoApplication: targetRevision: argocd-workshop server: 'https://kubernetes.default.svc' namespace: default - prune: true + prune: false selfHeal: true