From 5c8447acdb9ba5dbb936ec6db74e6255e20ce131 Mon Sep 17 00:00:00 2001
From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:19:54 +0530
Subject: [PATCH] Update some images in examples

Use artifact registry url for gb-frontend instead of gcr as images in gcr are not tagged anymore
Use registry.k8s.io instead of k8s.gcr.io

Signed-off-by: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com>
---
 examples/gitops/guestbook/all-in-one.yml      |  4 +-
 .../gitops/redis-with-configmap/redis.yml     | 40 +++++++-------
 examples/sts-alternative/config.yml           | 52 +++++++++----------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/examples/gitops/guestbook/all-in-one.yml b/examples/gitops/guestbook/all-in-one.yml
index e90e21d77..4148b54e8 100644
--- a/examples/gitops/guestbook/all-in-one.yml
+++ b/examples/gitops/guestbook/all-in-one.yml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - name: primary
-        image: k8s.gcr.io/redis:e2e  #! or just image: redis
+        image: registry.k8s.io/redis:e2e  #! or just image: redis
         resources:
           requests:
             cpu: 120m
@@ -140,7 +140,7 @@ spec:
     spec:
       containers:
       - name: php-redis
-        image: gcr.io/google-samples/gb-frontend:v4
+        image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5
         resources:
           requests:
             cpu: 100m
diff --git a/examples/gitops/redis-with-configmap/redis.yml b/examples/gitops/redis-with-configmap/redis.yml
index 440fe2a5b..75b77fb44 100644
--- a/examples/gitops/redis-with-configmap/redis.yml
+++ b/examples/gitops/redis-with-configmap/redis.yml
@@ -18,24 +18,24 @@ metadata:
     kapp.k14s.io/update-strategy: fallback-on-replace
 spec:
   containers:
-  - name: redis
-    image: k8s.gcr.io/redis:e2e
-    ports:
-    - containerPort: 6379
-    resources:
-      limits:
-        cpu: 100m
-    volumeMounts:
-    - mountPath: /redis-data
-      name: data
-    - mountPath: /redis-config
-      name: config
+    - name: redis
+      image: registry.k8s.io/redis:e2e
+      ports:
+        - containerPort: 6379
+      resources:
+        limits:
+          cpu: 100m
+      volumeMounts:
+        - mountPath: /redis-data
+          name: data
+        - mountPath: /redis-config
+          name: config
   volumes:
-  - name: data
-    emptyDir: {}
-  - name: config
-    configMap:
-      name: redis-config
-      items:
-      - key: redis-config
-        path: redis.conf
+    - name: data
+      emptyDir: {}
+    - name: config
+      configMap:
+        name: redis-config
+        items:
+          - key: redis-config
+            path: redis.conf
diff --git a/examples/sts-alternative/config.yml b/examples/sts-alternative/config.yml
index d3977ad53..090f04d57 100644
--- a/examples/sts-alternative/config.yml
+++ b/examples/sts-alternative/config.yml
@@ -7,10 +7,10 @@ kind: Service
 metadata:
   name: #@ data.values.name
 spec:
-  selector: 
+  selector:
     redis: ""
   ports:
-  - port: 6379
+    - port: 6379
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -23,6 +23,7 @@ data:
     maxmemory 4mb
     maxmemory-policy allkeys-lru
 
+
 #@ def idx_name(idx): return data.values.name+"-"+str(idx)
 
 #@ for idx in range(0, data.values.replicas):
@@ -44,28 +45,28 @@ metadata:
     (@= curr_idx_name @): ""
 spec:
   containers:
-  - name: redis
-    image: k8s.gcr.io/redis:e2e
-    ports:
-    - containerPort: 6379
-    resources:
-      limits:
-        cpu: 100m
-    volumeMounts:
-    - mountPath: /redis-data
-      name: data
-    - mountPath: /redis-config
-      name: config
+    - name: redis
+      image: registry.k8s.io/redis:e2e
+      ports:
+        - containerPort: 6379
+      resources:
+        limits:
+          cpu: 100m
+      volumeMounts:
+        - mountPath: /redis-data
+          name: data
+        - mountPath: /redis-config
+          name: config
   volumes:
-  - name: data
-    persistentVolumeClaim:
-      claimName: #@ curr_idx_name
-  - name: config
-    configMap:
-      name: #@ cfg_name
-      items:
-      - key: redis-config
-        path: redis.conf
+    - name: data
+      persistentVolumeClaim:
+        claimName: #@ curr_idx_name
+    - name: config
+      configMap:
+        name: #@ cfg_name
+        items:
+          - key: redis-config
+            path: redis.conf
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -85,11 +86,10 @@ kind: Service
 metadata:
   name: #@ curr_idx_name
 spec:
-  selector: 
+  selector:
     redis: ""
     #@yaml/text-templated-strings
     (@= curr_idx_name @): ""
   ports:
-  - port: 6379
-
+    - port: 6379
 #@ end