github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94693 from smarterclayton/busybox_substitute

Browse Source 
test/e2e: Busybox image is not being templatized
This commit is contained in:
Kubernetes Prow Robot 2020-09-17 05:24:58 -07:00 committed by GitHub
commit 3eb90c19d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/kubectl/kubectl.go
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)
}) })

2
test/e2e/testing-manifests/kubectl/busybox-cronjob.yaml → test/e2e/testing-manifests/kubectl/busybox-cronjob.yaml.in
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

2
test/e2e/testing-manifests/kubectl/busybox-pod.yaml → test/e2e/testing-manifests/kubectl/busybox-pod.yaml.in
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