Skip to content

Commit aaa9047

Browse files
test/e2e: Busybox image is not being templatized
All images used by e2e tests must use templates in order to allow relocation. In addition this is hitting Dockerhub which will be getting throttled soon.
1 parent 3d52b8b commit aaa9047

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test/e2e/kubectl/kubectl.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ metadata:
12051205

12061206
ginkgo.It("should check if kubectl describe prints relevant information for cronjob", func() {
12071207
ginkgo.By("creating a cronjob")
1208-
cronjobYaml := commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-cronjob.yaml")))
1208+
cronjobYaml := commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-cronjob.yaml.in")))
12091209
framework.RunKubectlOrDieInput(ns, cronjobYaml, "create", "-f", "-")
12101210

12111211
ginkgo.By("waiting for cronjob to start.")
@@ -1365,7 +1365,7 @@ metadata:
13651365
var podYaml string
13661366
ginkgo.BeforeEach(func() {
13671367
ginkgo.By("creating the pod")
1368-
podYaml = commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-pod.yaml")))
1368+
podYaml = commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-pod.yaml.in")))
13691369
framework.RunKubectlOrDieInput(ns, podYaml, "create", "-f", "-")
13701370
framework.ExpectEqual(e2epod.CheckPodsRunningReady(c, ns, []string{busyboxPodName}, framework.PodStartTimeout), true)
13711371
})

test/e2e/testing-manifests/kubectl/busybox-cronjob.yaml renamed to test/e2e/testing-manifests/kubectl/busybox-cronjob.yaml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: test
18-
image: busybox
18+
image: {{.BusyBoxImage}}
1919
args:
2020
- "/bin/true"
2121
restartPolicy: OnFailure

test/e2e/testing-manifests/kubectl/busybox-pod.yaml renamed to test/e2e/testing-manifests/kubectl/busybox-pod.yaml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app: busybox1
77
spec:
88
containers:
9-
- image: busybox
9+
- image: {{.BusyBoxImage}}
1010
command: ["/bin/sh", "-c", "mkdir -p /root/foo/bar && echo 'foobar' > /root/foo/bar/foo.bar && sleep 3600"]
1111
imagePullPolicy: IfNotPresent
1212
name: busybox

0 commit comments

Comments
 (0)