diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-26 12:48:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 12:48:20 +0200 |
| commit | 21e1c3175dda40b8fd54985335b4152fe6a6cbd5 (patch) | |
| tree | 0758da1c7db8992ccf5be83c7d98cd91d26e72cb | |
| parent | ec5c7c1f6a1898dacddb6cc35802525c288b61ef (diff) | |
| parent | c197d19fe8890226f9fe416ece6fa4cbbb7f8108 (diff) | |
| download | podman-21e1c3175dda40b8fd54985335b4152fe6a6cbd5.tar.gz podman-21e1c3175dda40b8fd54985335b4152fe6a6cbd5.tar.bz2 podman-21e1c3175dda40b8fd54985335b4152fe6a6cbd5.zip | |
Merge pull request #11044 from vrothberg/play
play kube: support capitalized pull policy
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 5 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 4782f0d01..d257bad18 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -277,7 +277,10 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY // registry on localhost. pullPolicy := config.PullPolicyNewer if len(container.ImagePullPolicy) > 0 { - pullPolicy, err = config.ParsePullPolicy(string(container.ImagePullPolicy)) + // Make sure to lower the strings since K8s pull policy + // may be capitalized (see bugzilla.redhat.com/show_bug.cgi?id=1985905). + rawPolicy := string(container.ImagePullPolicy) + pullPolicy, err = config.ParsePullPolicy(strings.ToLower(rawPolicy)) if err != nil { return nil, err } diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 5e303bf2f..66bfdefe7 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1729,7 +1729,7 @@ var _ = Describe("Podman play kube", func() { }) It("podman play kube with pull policy of missing", func() { - ctr := getCtr(withPullPolicy("missing"), withImage(BB)) + ctr := getCtr(withPullPolicy("Missing"), withImage(BB)) err := generateKubeYaml("pod", getPod(withCtr(ctr)), kubeYaml) Expect(err).To(BeNil()) |