Update podinfo to v6.1

Signed-off-by: Stefan Prodan <[email protected]>

Author: stefanprodan

.github/workflows/e2e.yaml

@@ -45,7 +45,7 @@ jobs:
           flux tree ks flux-system
       - name: Test canary release
         run: |
-          kubectl -n prod set image deployment/backend backend=stefanprodan/podinfo:5.0.1
+          kubectl -n prod set image deployment/backend backend=ghcr.io/stefanprodan/podinfo:6.1.1
           echo '>>> Waiting for canary finalization'
           retries=25
           count=0

README.md

@@ -97,7 +97,7 @@ For example, in [clusters/my-cluster/apps.yaml](https://github.com/stefanprodan/
 we tell Flux that the `apps` reconciliation depends on the `istio-system` one:
 
 ```yaml
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: apps
@@ -139,16 +139,16 @@ You can customize the Istio installation using the Flux `HelmReleases` located a
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: istiod
+  name: istio-gateway
   namespace: istio-system
 spec:
-  # chart spec omitted 
+  dependsOn:
+    - name: istio-base
+    - name: istiod
+  # source: https://github.com/istio/istio/blob/master/manifests/charts/gateway/values.yaml
   values:
-    pilot:
-      resources:
-        requests:
-          cpu: 100m
-          memory: 128Mi
+    autoscaling:
+      enabled: true
 ```
 
 After modifying the Helm release values, you can push the change to git and Flux
@@ -237,14 +237,14 @@ git pull origin main
 To trigger a canary deployment for the backend app, bump the container image:
 
 ```bash
-yq e '.images[0].newTag="5.0.1"' -i ./apps/backend/kustomization.yaml
+yq e '.images[0].newTag="6.1.1"' -i ./apps/backend/kustomization.yaml
 ```
 
 Commit and push changes:
 
 ```bash
 git add -A && \
-git commit -m "backend 5.0.1" && \
+git commit -m "backend 6.1.1" && \
 git push origin main
 ```
 
@@ -322,10 +322,10 @@ have an insider cookie. The frontend configuration can be found at `apps/fronten
 Trigger a deployment by updating the frontend container image:
 
 ```bash
-yq e '.images[0].newTag="5.0.1"' -i ./apps/frontend/kustomization.yaml
+yq e '.images[0].newTag="6.1.1"' -i ./apps/frontend/kustomization.yaml
 
 git add -A && \
-git commit -m "frontend 5.0.1" && \
+git commit -m "frontend 6.1.1" && \
 git push origin main
 
 flux reconcile source git flux-system
@@ -384,7 +384,8 @@ defines two metric checks:
 The Prometheus queries used for checking the error rate and latency are located at
 [flagger-metrics.yaml](https://github.com/stefanprodan/gitops-istio/blob/main/istio/gateway/flagger-metrics.yaml).
 
-During the canary analysis you can generate HTTP 500 errors and high latency to test Flagger's rollback.
+Bump the frontend version to `6.1.2`, then during the canary analysis you can generate
+HTTP 500 errors and high latency to test Flagger's rollback.
 
 Generate HTTP 500 errors:
 

apps/backend/canary.yaml

@@ -14,7 +14,7 @@ spec:
   progressDeadlineSeconds: 120
   # HPA reference (optional)
   autoscalerRef:
-    apiVersion: autoscaling/v2beta1
+    apiVersion: autoscaling/v2beta2
     kind: HorizontalPodAutoscaler
     name: backend
   service:

apps/backend/deployment.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:

apps/backend/hpa.yaml

@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: backend
@@ -7,13 +7,13 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: backend
+    name: frontend
   minReplicas: 1
   maxReplicas: 4
   metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      # scale up if usage is above
-      # 99% of the requested CPU (100m)
-      targetAverageUtilization: 99
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 99

apps/backend/kustomization.yaml

@@ -7,4 +7,4 @@ resources:
 images:
   - name: ghcr.io/stefanprodan/podinfo
     newName: ghcr.io/stefanprodan/podinfo
-    newTag: 5.0.0
+    newTag: 6.1.0

apps/frontend/canary.yaml

@@ -14,7 +14,7 @@ spec:
   progressDeadlineSeconds: 60
   # HPA reference (optional)
   autoscalerRef:
-    apiVersion: autoscaling/v2beta1
+    apiVersion: autoscaling/v2beta2
     kind: HorizontalPodAutoscaler
     name: frontend
   service:

apps/frontend/hpa.yaml

@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: frontend
@@ -8,12 +8,12 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: frontend
-  minReplicas: 1
+  minReplicas: 2
   maxReplicas: 4
   metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      # scale up if usage is above
-      # 99% of the requested CPU (100m)
-      targetAverageUtilization: 99
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 99

apps/frontend/kustomization.yaml

@@ -1,10 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- canary.yaml
-- deployment.yaml
-- hpa.yaml
+  - canary.yaml
+  - deployment.yaml
+  - hpa.yaml
 images:
   - name: ghcr.io/stefanprodan/podinfo
     newName: ghcr.io/stefanprodan/podinfo
-    newTag: 5.0.0
+    newTag: 6.1.0

clusters/my-cluster/apps.yaml

@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: apps
@@ -12,9 +12,5 @@ spec:
     name: flux-system
   path: ./apps
   prune: true
-  validation: client
-  healthChecks:
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: flagger-loadtester
-      namespace: prod
+  wait: true
+  timeout: 2m0s