Skip to content

Commit 7b47645

Browse files
cybertronopenshift-cherrypick-robot
authored andcommitted
Add quotes around image reference in resolv-prepender
1 parent 9540bd3 commit 7b47645

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ contents:
1717
# restart the service or we may interrupt the pull and end up with a corrupt image.
1818
# We're better off with incorrect search domains for a while than wedging the
1919
# system with a bad image.
20-
if ! diff -q /run/resolv-prepender/env /run/resolv-prepender/env.new && /usr/bin/podman image exists {{ .Images.baremetalRuntimeCfgImage }}; then
20+
if ! diff -q /run/resolv-prepender/env /run/resolv-prepender/env.new && /usr/bin/podman image exists "{{ .Images.baremetalRuntimeCfgImage }}"; then
2121
>&2 echo "NM resolv-prepender: Environment variable(s) changed. Restarting service."
2222
systemctl is-active on-prem-resolv-prepender && systemctl kill on-prem-resolv-prepender
2323
fi

templates/common/on-prem/files/resolv-prepender.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ contents:
2323
# Ref.: https://github.com/containers/common/blob/e028741ef77fdfa3ae261b9d23cdd50253d586c4/libimage/copier.go#L27-L30
2424
2525
>&2 echo "NM resolv-prepender: Checking if baremetal runtime cfg image already exists"
26-
if ! /usr/bin/podman image exists {{ .Images.baremetalRuntimeCfgImage }}; then
26+
if ! /usr/bin/podman image exists "{{ .Images.baremetalRuntimeCfgImage }}"; then
2727
>&2 echo "NM resolv-prepender: Starting download of baremetal runtime cfg image"
28-
while ! /usr/bin/podman pull --authfile /var/lib/kubelet/config.json {{ .Images.baremetalRuntimeCfgImage }}; do sleep 1; done
28+
while ! /usr/bin/podman pull --authfile /var/lib/kubelet/config.json "{{ .Images.baremetalRuntimeCfgImage }}"; do sleep 1; done
2929
>&2 echo "NM resolv-prepender: Download of baremetal runtime cfg image completed"
3030
else
3131
>&2 echo "NM resolv-prepender: Image exists, no need to download"

0 commit comments

Comments
 (0)