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.
This commit is contained in:
Clayton Coleman 2020-09-10 14:20:08 -04:00
parent 3d52b8b5d6
commit aaa90476cb
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
3 changed files with 4 additions and 4 deletions

View File

@ -1205,7 +1205,7 @@ metadata:
ginkgo.It("should check if kubectl describe prints relevant information for cronjob", func() { ginkgo.It("should check if kubectl describe prints relevant information for cronjob", func() {
ginkgo.By("creating a cronjob") ginkgo.By("creating a cronjob")
cronjobYaml := commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-cronjob.yaml"))) cronjobYaml := commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-cronjob.yaml.in")))
framework.RunKubectlOrDieInput(ns, cronjobYaml, "create", "-f", "-") framework.RunKubectlOrDieInput(ns, cronjobYaml, "create", "-f", "-")
ginkgo.By("waiting for cronjob to start.") ginkgo.By("waiting for cronjob to start.")
@ -1365,7 +1365,7 @@ metadata:
var podYaml string var podYaml string
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
ginkgo.By("creating the pod") ginkgo.By("creating the pod")
podYaml = commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-pod.yaml"))) podYaml = commonutils.SubstituteImageName(string(readTestFileOrDie("busybox-pod.yaml.in")))
framework.RunKubectlOrDieInput(ns, podYaml, "create", "-f", "-") framework.RunKubectlOrDieInput(ns, podYaml, "create", "-f", "-")
framework.ExpectEqual(e2epod.CheckPodsRunningReady(c, ns, []string{busyboxPodName}, framework.PodStartTimeout), true) framework.ExpectEqual(e2epod.CheckPodsRunningReady(c, ns, []string{busyboxPodName}, framework.PodStartTimeout), true)
}) })

View File

@ -15,7 +15,7 @@ spec:
spec: spec:
containers: containers:
- name: test - name: test
image: busybox image: {{.BusyBoxImage}}
args: args:
- "/bin/true" - "/bin/true"
restartPolicy: OnFailure restartPolicy: OnFailure

View File

@ -6,7 +6,7 @@ metadata:
app: busybox1 app: busybox1
spec: spec:
containers: containers:
- image: busybox - image: {{.BusyBoxImage}}
command: ["/bin/sh", "-c", "mkdir -p /root/foo/bar && echo 'foobar' > /root/foo/bar/foo.bar && sleep 3600"] command: ["/bin/sh", "-c", "mkdir -p /root/foo/bar && echo 'foobar' > /root/foo/bar/foo.bar && sleep 3600"]
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: busybox name: busybox