Merge pull request #3849 from camilamacedo86/upgrade-images-used-samples

🌱 Upgrade images used in the samples and e2e tests for deployImage plugin

Author: k8s-ci-robot

test/e2e/deployimage/plugin_cluster_test.go

@@ -91,7 +91,7 @@ var _ = Describe("kubebuilder", func() {
 				"--version", kbc.Version,
 				"--kind", kbc.Kind,
 				"--plugins", "deploy-image/v1-alpha",
-				"--image", "memcached:1.4.36-alpine",
+				"--image", "memcached:1.6.26-alpine3.19",
 				"--image-container-port", "11211",
 				"--image-container-command", "memcached,-m=64,-o,modern,-v",
 				"--run-as-user", "1001",
@@ -128,7 +128,7 @@ var _ = Describe("kubebuilder", func() {
 				"--version", kbc.Version,
 				"--kind", kbc.Kind,
 				"--plugins", "deploy-image/v1-alpha",
-				"--image", "busybox:1.28",
+				"--image", "busybox:1.36.1",
 				"--make=false",
 				"--manifests=false",
 			)

test/e2e/setup.sh

@@ -56,8 +56,8 @@ function delete_cluster {
 function test_cluster {
   local flags="$@"
 
-  docker pull memcached:1.6.23-alpine
-  kind load docker-image --name $KIND_CLUSTER memcached:1.6.23-alpine
+  docker pull memcached:1.6.26-alpine3.19
+  kind load docker-image --name $KIND_CLUSTER memcached:1.6.26-alpine3.19
 
   docker pull busybox:1.36.1
   kind load docker-image --name $KIND_CLUSTER busybox:1.36.1

test/testdata/generate.sh

@@ -104,8 +104,8 @@ function scaffold_test_project {
     fi
   elif [[ $project =~ deploy-image ]]; then
       header_text 'Creating Memcached API with deploy-image plugin ...'
-      $kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:1.4.36-alpine --image-container-command="memcached,-m=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false
-      $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false
+      $kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:memcached:1.6.26-alpine3.19 --image-container-command="memcached,-m=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false
+      $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.36.1 --plugins="deploy-image/v1-alpha" --make=false
       header_text 'Creating Memcached webhook ...'
       $kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
   fi

testdata/project-v4-with-deploy-image/PROJECT

@@ -14,14 +14,14 @@ plugins:
       options:
         containerCommand: memcached,-m=64,-o,modern,-v
         containerPort: "11211"
-        image: memcached:1.4.36-alpine
+        image: memcached:memcached:1.6.26-alpine3.19
         runAsUser: "1001"
       version: v1alpha1
     - domain: testproject.org
       group: example.com
       kind: Busybox
       options:
-        image: busybox:1.28
+        image: busybox:1.36.1
       version: v1alpha1
 projectName: project-v4-with-deploy-image
 repo: sigs.k8s.io/kubebuilder/testdata/project-v4-with-deploy-image

testdata/project-v4-with-deploy-image/config/manager/manager.yaml

@@ -74,9 +74,9 @@ spec:
         name: manager
         env:
         - name: BUSYBOX_IMAGE
-          value: busybox:1.28
+          value: busybox:1.36.1
         - name: MEMCACHED_IMAGE
-          value: memcached:1.4.36-alpine
+          value: memcached:memcached:1.6.26-alpine3.19
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

testdata/project-v4-with-deploy-image/dist/install.yaml

@@ -598,9 +598,9 @@ spec:
         - /manager
         env:
         - name: BUSYBOX_IMAGE
-          value: busybox:1.28
+          value: busybox:1.36.1
         - name: MEMCACHED_IMAGE
-          value: memcached:1.4.36-alpine
+          value: memcached:memcached:1.6.26-alpine3.19
         image: controller:latest
         livenessProbe:
           httpGet: