Update some images in examples and tests

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 Use ghcr instead of dockerhub to pull busybox Signed-off-by: Praveen Rewar <[email protected]>
carvel-dev · Dec 18, 2023 · 146a5b7 · 146a5b7
1 parent 75e9565
commit 146a5b7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -19,7 +19,7 @@ metadata:
 spec:
   containers:
   - name: redis
-    image: k8s.gcr.io/redis:e2e
+    image: registry.k8s.io/redis:e2e
     ports:
     - containerPort: 6379
     resources:

diff --git a/examples/sts-alternative/config.yml b/examples/sts-alternative/config.yml
@@ -45,7 +45,7 @@ metadata:
 spec:
   containers:
   - name: redis
-    image: k8s.gcr.io/redis:e2e
+    image: registry.k8s.io/redis:e2e
     ports:
     - containerPort: 6379
     resources:

diff --git a/test/e2e/apply_wait_error_test.go b/test/e2e/apply_wait_error_test.go
@@ -33,7 +33,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: my-job-fail
-          image: busybox
+          image: ghcr.io/chainguard-images/busybox
           command: [ "sh", "-c", "exit 1" ]
   backoffLimit: 0
 ---
@@ -51,7 +51,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: my-job-fail-2
-          image: busybox
+          image: ghcr.io/chainguard-images/busybox
           command: [ "sh", "-c", "exit 1" ]
   backoffLimit: 0
 ---
@@ -70,7 +70,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: my-job-succeed
-          image: busybox
+          image: ghcr.io/chainguard-images/busybox
           command: [ "sh", "-c", "exit 0" ]
   backoffLimit: 0
 ---
@@ -181,7 +181,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: my-job-succeed
-          image: busybox
+          image: ghcr.io/chainguard-images/busybox
           command: [ "sh", "-c", "exit 0" ]
   backoffLimit: 0
 ---

diff --git a/test/e2e/create_fallback_on_update_test.go b/test/e2e/create_fallback_on_update_test.go
@@ -39,7 +39,7 @@ spec:
     spec:
       containers:
       - name: successful-job
-        image: busybox
+        image: ghcr.io/chainguard-images/busybox
         command: ["/bin/sh", "-c", "sleep 10"]
       restartPolicy: Never
 ---

diff --git a/test/e2e/formatted_error_test.go b/test/e2e/formatted_error_test.go
@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: successful-job
-        image: busybox
+        image: ghcr.io/chainguard-images/busybox
         command: ["/bin/sh", "-c", "sleep 11"]
       restartPolicy: Never
 `

diff --git a/test/e2e/wait_timeout_test.go b/test/e2e/wait_timeout_test.go
@@ -27,7 +27,7 @@ func TestWaitTimeout(t *testing.T) {
      spec: 
        containers: 
        - name: successful-job 
-         image: busybox 
+         image: ghcr.io/chainguard-images/busybox
          command: ["/bin/sh", "-c", "sleep 10"] 
        restartPolicy: Never
 `