Bug 1748452: data/bootstrap: Replace openshift.sh with cluster-bootstrap

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

@@ -48,6 +48,13 @@ systemctl restart cri-o.service
 
 mkdir --parents ./{bootstrap-manifests,manifests}
 
+if [ ! -f openshift-manifests.done ]
+then
+	echo "Moving OpenShift manifests in with the rest of them"
+	cp openshift/* manifests/
+	touch openshift-manifests.done
+fi
+
 if [ ! -f cvo-bootstrap.done ]
 then
 	echo "Rendering Cluster Version Operator Manifests..."

data/data/bootstrap/files/usr/local/bin/installer-gather.sh

@@ -4,7 +4,7 @@ ARTIFACTS="/tmp/artifacts"
 
 echo "Gathering bootstrap journals ..."
 mkdir -p "${ARTIFACTS}/bootstrap/journals"
-for service in release-image bootkube openshift kubelet crio approve-csr
+for service in release-image bootkube kubelet crio approve-csr
 do
     journalctl --boot --no-pager --output=short --unit="${service}" > "${ARTIFACTS}/bootstrap/journals/${service}.log"
 done

data/data/bootstrap/files/usr/local/bin/report-progress.sh

@@ -11,7 +11,6 @@ wait_for_existance() {
 
 echo "Waiting for bootstrap to complete..."
 wait_for_existance /opt/openshift/.bootkube.done
-wait_for_existance /opt/openshift/.openshift.done
 
 echo "Reporting install progress..."
 while ! oc --config="$KUBECONFIG" create -f - <<-EOF

data/data/bootstrap/gcp/files/usr/local/bin/report-progress.sh

@@ -11,7 +11,6 @@ wait_for_existance() {
 
 echo "Waiting for bootstrap to complete..."
 wait_for_existance /opt/openshift/.bootkube.done
-wait_for_existance /opt/openshift/.openshift.done
 
 ## remove the routes setup so that we can open up the blackhole
 systemctl stop gcp-routes.service

data/data/bootstrap/systemd/units/progress.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=Report the completion of the cluster bootstrap process
 # Workaround for https://github.com/systemd/systemd/issues/1312
-Wants=bootkube.service openshift.service
-After=bootkube.service openshift.service
+Wants=bootkube.service
+After=bootkube.service
 
 [Service]
 ExecStart=/usr/local/bin/report-progress.sh /opt/openshift/auth/kubeconfig

pkg/asset/machines/master.go

@@ -266,8 +266,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 		return fmt.Errorf("invalid Platform")
 	}
 
-	userDataMap := map[string][]byte{"master-user-data": mign.File.Data}
-	data, err := userDataList(userDataMap)
+	data, err := userDataSecret("master-user-data", mign.File.Data)
 	if err != nil {
 		return errors.Wrap(err, "failed to create user-data secret for master machines")
 	}

pkg/asset/machines/userdata.go

@@ -8,34 +8,25 @@ import (
 	"github.com/pkg/errors"
 )
 
-var userDataListTmpl = template.Must(template.New("user-data-list").Parse(`
-kind: List
-apiVersion: v1
+var userDataTmpl = template.Must(template.New("user-data").Parse(`apiVersion: v1
+kind: Secret
 metadata:
-  resourceVersion: ""
-  selfLink: ""
-items:
-{{- range $name, $content := . }}
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: {{$name}}
-    namespace: openshift-machine-api
-  type: Opaque
-  data:
-    disableTemplating: "dHJ1ZQo="
-    userData: {{$content}}
-{{- end}}
+  name: {{.name}}
+  namespace: openshift-machine-api
+type: Opaque
+data:
+  disableTemplating: "dHJ1ZQo="
+  userData: {{.content}}
 `))
 
-func userDataList(data map[string][]byte) ([]byte, error) {
-	encodedData := map[string]string{}
-	for name, content := range data {
-		encodedData[name] = base64.StdEncoding.EncodeToString(content)
+func userDataSecret(name string, content []byte) ([]byte, error) {
+	encodedData := map[string]string{
+		"name":    name,
+		"content": base64.StdEncoding.EncodeToString(content),
 	}
 	buf := &bytes.Buffer{}
-	if err := userDataListTmpl.Execute(buf, encodedData); err != nil {
-		return nil, errors.Wrap(err, "failed to execute content.UserDataListTmpl")
+	if err := userDataTmpl.Execute(buf, encodedData); err != nil {
+		return nil, errors.Wrap(err, "failed to execute user-data template")
 	}
 	return buf.Bytes(), nil
 }

pkg/asset/machines/worker.go

@@ -260,8 +260,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 		}
 	}
 
-	userDataMap := map[string][]byte{"worker-user-data": wign.File.Data}
-	data, err := userDataList(userDataMap)
+	data, err := userDataSecret("worker-user-data", wign.File.Data)
 	if err != nil {
 		return errors.Wrap(err, "failed to create user-data secret for worker machines")
 	}