Merge pull request #1315 from wking/etcdctl-from-release-image

data/bootstrap/files/usr/local/bin/bootkube: etcdctl from release image
openshift · Feb 26, 2019 · 958724a · 958724a
2 parents 7630fb9 + 825cd71
commit 958724a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
@@ -240,8 +240,8 @@ until podman run \
 		--name etcdctl \
 		--env ETCDCTL_API=3 \
 		--volume /opt/openshift/tls:/opt/openshift/tls:ro,z \
-		"{{.EtcdctlImage}}" \
-		/usr/local/bin/etcdctl \
+		--entrypoint etcdctl \
+		"${MACHINE_CONFIG_ETCD_IMAGE}" \
 		--dial-timeout=10m \
 		--cacert=/opt/openshift/tls/etcd-client-ca.crt \
 		--cert=/opt/openshift/tls/etcd-client.crt \

diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -32,7 +32,6 @@ const (
 	rootDir              = "/opt/openshift"
 	bootstrapIgnFilename = "bootstrap.ign"
 	etcdCertSignerImage  = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6"
-	etcdctlImage         = "quay.io/coreos/etcd:v3.3.10"
 	ignitionUser         = "core"
 )
 
@@ -45,7 +44,6 @@ var (
 type bootstrapTemplateData struct {
 	EtcdCertSignerImage string
 	EtcdCluster         string
-	EtcdctlImage        string
 	PullSecret          string
 	ReleaseImage        string
 }
@@ -182,7 +180,6 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
 
 	return &bootstrapTemplateData{
 		EtcdCertSignerImage: etcdCertSignerImage,
-		EtcdctlImage:        etcdctlImage,
 		PullSecret:          installConfig.PullSecret,
 		ReleaseImage:        releaseImage,
 		EtcdCluster:         strings.Join(etcdEndpoints, ","),