Merge pull request openshift#775 from wking/pull-secret-for-bootkube.sh

pkg/asset/ignition/bootstrap: Add /root/.docker/config.json
wking · Dec 3, 2018 · 6585f5d · 6585f5d
2 parents ec1abc2 + 791a41c
commit 6585f5d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/data/data/bootstrap/files/root/.docker/config.json.template b/data/data/bootstrap/files/root/.docker/config.json.template
@@ -0,0 +1 @@
+{{.PullSecret}}
diff --git a/data/data/manifests/bootkube/pull.yaml.template b/data/data/manifests/bootkube/pull.yaml.template
@@ -7,6 +7,6 @@
  "name": "coreos-pull-secret"
  },
  "data": {
- ".dockerconfigjson": "{{.PullSecret}}"
+ ".dockerconfigjson": "{{.PullSecretBase64}}"
  }
 }
diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -40,6 +40,7 @@ type bootstrapTemplateData struct {
  EtcdCertSignerImage string
  EtcdCluster string
  EtcdctlImage string
+ PullSecret string
  ReleaseImage string
  AdminKubeConfigBase64 string
 }
@@ -148,6 +149,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, adminKub
  return &bootstrapTemplateData{
  EtcdCertSignerImage: "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6",
  EtcdctlImage: "quay.io/coreos/etcd:v3.2.14",
+ PullSecret: installConfig.PullSecret,
  ReleaseImage: releaseImage,
  EtcdCluster: strings.Join(etcdEndpoints, ","),
  AdminKubeConfigBase64: base64.StdEncoding.EncodeToString(adminKubeConfig),

diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -150,7 +150,7 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
  KubeCaKey: base64.StdEncoding.EncodeToString(kubeCA.Key()),
  McsTLSCert: base64.StdEncoding.EncodeToString(mcsCertKey.Cert()),
  McsTLSKey: base64.StdEncoding.EncodeToString(mcsCertKey.Key()),
- PullSecret:  base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
+ PullSecretBase64: base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
  RootCaCert: string(rootCA.Cert()),
  ServiceServingCaCert: base64.StdEncoding.EncodeToString(serviceServingCA.Cert()),
  ServiceServingCaKey: base64.StdEncoding.EncodeToString(serviceServingCA.Key()),

diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go
@@ -25,7 +25,7 @@ type bootkubeTemplateData struct {
  KubeCaKey string
  McsTLSCert string
  McsTLSKey string
- PullSecret  string
+ PullSecretBase64 string
  RootCaCert string
  ServiceServingCaCert string
  ServiceServingCaKey string