Skip to content

Commit 08adfea

Browse files
authored
Merge pull request #4230 from camilamacedo86/fix-image-testdata
🌱 Fix incorrect image reference for DeployImage plugin in test data
2 parents eae8b21 + 9b6a837 commit 08adfea

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

test/testdata/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function scaffold_test_project {
8686
if [[ $project =~ multigroup ]] || [[ $project =~ with-plugins ]] ; then
8787
header_text 'With Optional Plugins ...'
8888
header_text 'Creating APIs with deploy-image plugin ...'
89-
$kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:memcached:1.6.26-alpine3.19 --image-container-command="memcached,--memory-limit=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false
89+
$kb create api --group example.com --version v1alpha1 --kind Memcached --image=memcached:1.6.26-alpine3.19 --image-container-command="memcached,--memory-limit=64,-o,modern,-v" --image-container-port="11211" --run-as-user="1001" --plugins="deploy-image/v1-alpha" --make=false
9090
$kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.36.1 --plugins="deploy-image/v1-alpha" --make=false
9191
$kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
9292
header_text 'Editing project with Grafana plugin ...'

testdata/project-v4-multigroup/PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins:
1515
options:
1616
containerCommand: memcached,--memory-limit=64,-o,modern,-v
1717
containerPort: "11211"
18-
image: memcached:memcached:1.6.26-alpine3.19
18+
image: memcached:1.6.26-alpine3.19
1919
runAsUser: "1001"
2020
version: v1alpha1
2121
- domain: testproject.org

testdata/project-v4-multigroup/config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
- name: BUSYBOX_IMAGE
7070
value: busybox:1.36.1
7171
- name: MEMCACHED_IMAGE
72-
value: memcached:memcached:1.6.26-alpine3.19
72+
value: memcached:1.6.26-alpine3.19
7373
securityContext:
7474
allowPrivilegeEscalation: false
7575
capabilities:

testdata/project-v4-multigroup/dist/install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ spec:
17641764
- name: BUSYBOX_IMAGE
17651765
value: busybox:1.36.1
17661766
- name: MEMCACHED_IMAGE
1767-
value: memcached:memcached:1.6.26-alpine3.19
1767+
value: memcached:1.6.26-alpine3.19
17681768
image: controller:latest
17691769
livenessProbe:
17701770
httpGet:

testdata/project-v4-with-plugins/PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins:
1414
options:
1515
containerCommand: memcached,--memory-limit=64,-o,modern,-v
1616
containerPort: "11211"
17-
image: memcached:memcached:1.6.26-alpine3.19
17+
image: memcached:1.6.26-alpine3.19
1818
runAsUser: "1001"
1919
version: v1alpha1
2020
- domain: testproject.org

testdata/project-v4-with-plugins/config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
- name: BUSYBOX_IMAGE
7070
value: busybox:1.36.1
7171
- name: MEMCACHED_IMAGE
72-
value: memcached:memcached:1.6.26-alpine3.19
72+
value: memcached:1.6.26-alpine3.19
7373
securityContext:
7474
allowPrivilegeEscalation: false
7575
capabilities:

testdata/project-v4-with-plugins/dist/install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ spec:
606606
- name: BUSYBOX_IMAGE
607607
value: busybox:1.36.1
608608
- name: MEMCACHED_IMAGE
609-
value: memcached:memcached:1.6.26-alpine3.19
609+
value: memcached:1.6.26-alpine3.19
610610
image: controller:latest
611611
livenessProbe:
612612
httpGet:

0 commit comments

Comments
 (0)