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/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/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 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..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 @@ -27,7 +27,7 @@ metadata: app: reviews version: v1 spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.reviews.replicaCount }} selector: matchLabels: app: reviews @@ -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 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 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