Skip to content

Commit 7d2b7fb

Browse files
Upgrade images used in the samples and e2e tests for deployImage plugin
1 parent a7f6e03 commit 7d2b7fb

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

test/e2e/deployimage/plugin_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var _ = Describe("kubebuilder", func() {
9191
"--version", kbc.Version,
9292
"--kind", kbc.Kind,
9393
"--plugins", "deploy-image/v1-alpha",
94-
"--image", "memcached:1.4.36-alpine",
94+
"--image", "memcached:1.6.26-alpine3.19",
9595
"--image-container-port", "11211",
9696
"--image-container-command", "memcached,-m=64,-o,modern,-v",
9797
"--run-as-user", "1001",
@@ -128,7 +128,7 @@ var _ = Describe("kubebuilder", func() {
128128
"--version", kbc.Version,
129129
"--kind", kbc.Kind,
130130
"--plugins", "deploy-image/v1-alpha",
131-
"--image", "busybox:1.28",
131+
"--image", "busybox:1.36.1",
132132
"--make=false",
133133
"--manifests=false",
134134
)

test/e2e/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ function delete_cluster {
5656
function test_cluster {
5757
local flags="$@"
5858

59-
docker pull memcached:1.6.23-alpine
60-
kind load docker-image --name $KIND_CLUSTER memcached:1.6.23-alpine
59+
docker pull memcached:1.6.26-alpine3.19
60+
kind load docker-image --name $KIND_CLUSTER memcached:1.6.26-alpine3.19
6161

6262
docker pull busybox:1.36.1
6363
kind load docker-image --name $KIND_CLUSTER busybox:1.36.1

test/testdata/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ function scaffold_test_project {
104104
fi
105105
elif [[ $project =~ deploy-image ]]; then
106106
header_text 'Creating Memcached API with deploy-image plugin ...'
107-
$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
108-
$kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false
107+
$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
108+
$kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.36.1 --plugins="deploy-image/v1-alpha" --make=false
109109
header_text 'Creating Memcached webhook ...'
110110
$kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
111111
fi

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ plugins:
1414
options:
1515
containerCommand: memcached,-m=64,-o,modern,-v
1616
containerPort: "11211"
17-
image: memcached:1.4.36-alpine
17+
image: memcached:memcached:1.6.26-alpine3.19
1818
runAsUser: "1001"
1919
version: v1alpha1
2020
- domain: testproject.org
2121
group: example.com
2222
kind: Busybox
2323
options:
24-
image: busybox:1.28
24+
image: busybox:1.36.1
2525
version: v1alpha1
2626
projectName: project-v4-with-deploy-image
2727
repo: sigs.k8s.io/kubebuilder/testdata/project-v4-with-deploy-image

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ spec:
7474
name: manager
7575
env:
7676
- name: BUSYBOX_IMAGE
77-
value: busybox:1.28
77+
value: busybox:1.36.1
7878
- name: MEMCACHED_IMAGE
79-
value: memcached:1.4.36-alpine
79+
value: memcached:memcached:1.6.26-alpine3.19
8080
securityContext:
8181
allowPrivilegeEscalation: false
8282
capabilities:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,9 +598,9 @@ spec:
598598
- /manager
599599
env:
600600
- name: BUSYBOX_IMAGE
601-
value: busybox:1.28
601+
value: busybox:1.36.1
602602
- name: MEMCACHED_IMAGE
603-
value: memcached:1.4.36-alpine
603+
value: memcached:memcached:1.6.26-alpine3.19
604604
image: controller:latest
605605
livenessProbe:
606606
httpGet:

0 commit comments

Comments
 (0)