diff --git a/blue-green/values.yaml b/blue-green/values.yaml index d0f2bf589b..3daae00cb1 100644 --- a/blue-green/values.yaml +++ b/blue-green/values.yaml @@ -5,8 +5,8 @@ replicaCount: 1 image: - repository: quay.io/argoprojlabs/argocd-e2e-container - tag: 0.1 + repository: gcr.io/google-samples/gb-frontend + tag: v5 pullPolicy: IfNotPresent service: @@ -15,7 +15,8 @@ service: ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" path: / @@ -26,7 +27,8 @@ ingress: # hosts: # - chart-example.local -resources: {} +resources: + {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following diff --git a/guestbook/guestbook-ui-deployment.yaml b/guestbook/guestbook-ui-deployment.yaml index d0591f0831..38760ff641 100644 --- a/guestbook/guestbook-ui-deployment.yaml +++ b/guestbook/guestbook-ui-deployment.yaml @@ -14,7 +14,7 @@ spec: app: guestbook-ui spec: containers: - - image: quay.io/argoprojlabs/argocd-e2e-container:0.2 - name: guestbook-ui - ports: - - containerPort: 80 + - image: gcr.io/google-samples/gb-frontend:v5 + name: guestbook-ui + ports: + - containerPort: 80 diff --git a/helm-guestbook/values.yaml b/helm-guestbook/values.yaml index c534ac7c2b..d247b389c4 100644 --- a/helm-guestbook/values.yaml +++ b/helm-guestbook/values.yaml @@ -5,8 +5,8 @@ replicaCount: 1 image: - repository: quay.io/argoprojlabs/argocd-e2e-container - tag: 0.1 + repository: gcr.io/google-samples/gb-frontend + tag: v5 pullPolicy: IfNotPresent containerPort: 80 @@ -17,7 +17,8 @@ service: ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" path: / @@ -28,7 +29,8 @@ ingress: # hosts: # - chart-example.local -resources: {} +resources: + {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following diff --git a/jsonnet-guestbook-tla/guestbook-ui.jsonnet b/jsonnet-guestbook-tla/guestbook-ui.jsonnet index c13b32b3de..20109238f9 100644 --- a/jsonnet-guestbook-tla/guestbook-ui.jsonnet +++ b/jsonnet-guestbook-tla/guestbook-ui.jsonnet @@ -1,9 +1,9 @@ function ( - containerPort=80, - image="quay.io/argoprojlabs/argocd-e2e-container:0.2", + containerPort=80, + image="gcr.io/google-samples/gb-frontend:v5", name="jsonnet-guestbook-ui", replicas=1, - servicePort=80, + servicePort=80, type="LoadBalancer" ) [ diff --git a/jsonnet-guestbook/params.libsonnet b/jsonnet-guestbook/params.libsonnet index 5ae0fa2431..076e947406 100644 --- a/jsonnet-guestbook/params.libsonnet +++ b/jsonnet-guestbook/params.libsonnet @@ -1,6 +1,6 @@ { containerPort: 80, - image: "quay.io/argoprojlabs/argocd-e2e-container:0.2", + image: "gcr.io/google-samples/gb-frontend:v5", name: "jsonnet-guestbook-ui", replicas: 1, servicePort: 80, diff --git a/kustomize-guestbook/guestbook-ui-deployment.yaml b/kustomize-guestbook/guestbook-ui-deployment.yaml index 8a562a52f8..38760ff641 100644 --- a/kustomize-guestbook/guestbook-ui-deployment.yaml +++ b/kustomize-guestbook/guestbook-ui-deployment.yaml @@ -14,7 +14,7 @@ spec: app: guestbook-ui spec: containers: - - image: quay.io/argoprojlabs/argocd-e2e-container:0.1 - name: guestbook-ui - ports: - - containerPort: 80 + - image: gcr.io/google-samples/gb-frontend:v5 + name: guestbook-ui + ports: + - containerPort: 80 diff --git a/plugins/kustomized-helm/overlays/guestbook-deployment.yaml b/plugins/kustomized-helm/overlays/guestbook-deployment.yaml index b0d496b2b6..a2eef094c4 100644 --- a/plugins/kustomized-helm/overlays/guestbook-deployment.yaml +++ b/plugins/kustomized-helm/overlays/guestbook-deployment.yaml @@ -7,4 +7,4 @@ spec: spec: containers: - name: helm-guestbook - image: "quay.io/argoprojlabs/argocd-e2e-container:0.2" + image: 'gcr.io/google-samples/gb-frontend:v5' diff --git a/sock-shop/base/carts-db-dep.yaml b/sock-shop/base/carts-db-dep.yaml index 5452b6faaf..78c231fa85 100644 --- a/sock-shop/base/carts-db-dep.yaml +++ b/sock-shop/base/carts-db-dep.yaml @@ -38,4 +38,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/carts-dep.yaml b/sock-shop/base/carts-dep.yaml index 7c44ff0feb..79e047416c 100644 --- a/sock-shop/base/carts-dep.yaml +++ b/sock-shop/base/carts-dep.yaml @@ -61,4 +61,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/catalogue-db-dep.yaml b/sock-shop/base/catalogue-db-dep.yaml index 23890fa97d..b738ca0333 100644 --- a/sock-shop/base/catalogue-db-dep.yaml +++ b/sock-shop/base/catalogue-db-dep.yaml @@ -27,4 +27,4 @@ spec: - name: mysql containerPort: 3306 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/catalogue-dep.yaml b/sock-shop/base/catalogue-dep.yaml index cfa66dc4c2..37510884e4 100644 --- a/sock-shop/base/catalogue-dep.yaml +++ b/sock-shop/base/catalogue-dep.yaml @@ -49,4 +49,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/front-end-dep.yaml b/sock-shop/base/front-end-dep.yaml index 069c5eff98..a3aba4a149 100644 --- a/sock-shop/base/front-end-dep.yaml +++ b/sock-shop/base/front-end-dep.yaml @@ -48,4 +48,4 @@ spec: initialDelaySeconds: 30 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/front-end-ingress.yaml b/sock-shop/base/front-end-ingress.yaml index b79f0f0352..604b519144 100644 --- a/sock-shop/base/front-end-ingress.yaml +++ b/sock-shop/base/front-end-ingress.yaml @@ -6,8 +6,8 @@ metadata: labels: name: front-end annotations: - ingress.kubernetes.io/proxy-body-size: 100M - ingress.kubernetes.io/app-root: '/' + nginx.ingress.kubernetes.io/proxy-body-size: 100M + nginx.ingress.kubernetes.io/app-root: '/' spec: ingressClassName: nginx rules: diff --git a/sock-shop/base/orders-db-dep.yaml b/sock-shop/base/orders-db-dep.yaml index 30b7181d68..00613620a9 100644 --- a/sock-shop/base/orders-db-dep.yaml +++ b/sock-shop/base/orders-db-dep.yaml @@ -38,4 +38,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/orders-dep.yaml b/sock-shop/base/orders-dep.yaml index b31d9add04..5911be2571 100644 --- a/sock-shop/base/orders-dep.yaml +++ b/sock-shop/base/orders-dep.yaml @@ -61,4 +61,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/payment-dep.yaml b/sock-shop/base/payment-dep.yaml index 4477eea7ae..9a235ac1dd 100644 --- a/sock-shop/base/payment-dep.yaml +++ b/sock-shop/base/payment-dep.yaml @@ -49,4 +49,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/queue-master-dep.yaml b/sock-shop/base/queue-master-dep.yaml index 626e69f7ed..5471d587ea 100644 --- a/sock-shop/base/queue-master-dep.yaml +++ b/sock-shop/base/queue-master-dep.yaml @@ -45,4 +45,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/rabbitmq-dep.yaml b/sock-shop/base/rabbitmq-dep.yaml index 064c6f6843..fa7cf20af3 100644 --- a/sock-shop/base/rabbitmq-dep.yaml +++ b/sock-shop/base/rabbitmq-dep.yaml @@ -41,4 +41,4 @@ spec: - containerPort: 9090 name: exporter nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/session-db-dep.yaml b/sock-shop/base/session-db-dep.yaml index 85cfed9935..28a626d55b 100644 --- a/sock-shop/base/session-db-dep.yaml +++ b/sock-shop/base/session-db-dep.yaml @@ -33,4 +33,4 @@ spec: - SETUID readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/shipping-dep.yaml b/sock-shop/base/shipping-dep.yaml index af8d90b27b..d0beeb9c6b 100644 --- a/sock-shop/base/shipping-dep.yaml +++ b/sock-shop/base/shipping-dep.yaml @@ -61,4 +61,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/sock-shop/base/user-db-dep.yaml b/sock-shop/base/user-db-dep.yaml index 41ec058b87..88018baa5a 100644 --- a/sock-shop/base/user-db-dep.yaml +++ b/sock-shop/base/user-db-dep.yaml @@ -39,4 +39,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux \ No newline at end of file diff --git a/sock-shop/base/user-dep.yaml b/sock-shop/base/user-dep.yaml index 228ad3e1d3..ce007aa5dc 100644 --- a/sock-shop/base/user-dep.yaml +++ b/sock-shop/base/user-dep.yaml @@ -52,4 +52,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux