Merge pull request #1105 from tjungblu/patch-3

OCPBUGS-18357: prepend authfile to podman create
openshift · Sep 11, 2023 · f859fbf · f859fbf
2 parents 8509226 + 7ce7469
commit f859fbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bindata/etcd/etcd-common-tools b/bindata/etcd/etcd-common-tools
@@ -24,7 +24,7 @@ function dl_etcdctl {
   fi
 
   local etcdimg=${ETCD_IMAGE}
-  local etcdctr=$(podman create ${etcdimg} --authfile=/var/lib/kubelet/config.json)
+  local etcdctr=$(podman create --authfile=/var/lib/kubelet/config.json ${etcdimg})
   local etcdmnt=$(podman mount "${etcdctr}")
   [ ! -d ${ETCDCTL_BIN_DIR} ] && mkdir -p ${ETCDCTL_BIN_DIR}
   cp ${etcdmnt}/bin/etcdctl ${ETCDCTL_BIN_DIR}/

diff --git a/pkg/operator/etcd_assets/bindata.go b/pkg/operator/etcd_assets/bindata.go