Merge pull request openshift#7666 from deads2k/skip-cluster-config

Skip cluster config

Author: deads2k

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

@@ -47,6 +47,7 @@ MACHINE_CONFIG_ETCD_IMAGE=$(image_for etcd)
 MACHINE_CONFIG_INFRA_IMAGE=$(image_for pod)
 
 CLUSTER_ETCD_OPERATOR_IMAGE=$(image_for cluster-etcd-operator)
+API_IMAGE=$(image_for cluster-config-api)
 CONFIG_OPERATOR_IMAGE=$(image_for cluster-config-operator)
 KUBE_APISERVER_OPERATOR_IMAGE=$(image_for cluster-kube-apiserver-operator)
 KUBE_CONTROLLER_MANAGER_OPERATOR_IMAGE=$(image_for cluster-kube-controller-manager-operator)
@@ -85,6 +86,28 @@ fi
 
 VERSION="$(oc adm release info -o 'jsonpath={.metadata.version}' "${MIRROR_FLAG}" "${RELEASE_IMAGE_DIGEST}")"
 
+if [ ! -f api-bootstrap.done ]
+then
+    record_service_stage_start "api-bootstrap"
+	echo "Rendering api manifests..."
+
+	rm --recursive --force api-bootstrap
+
+	bootkube_podman_run \
+		--name api-render \
+		--volume "$PWD:/assets:z" \
+		"${API_IMAGE}" \
+		/usr/bin/render \
+		--asset-output-dir=/assets/api-bootstrap \
+		--rendered-manifest-dir=/assets/manifests \
+		--payload-version=$VERSION
+
+	cp api-bootstrap/manifests/* manifests/
+
+	touch api-bootstrap.done
+    record_service_stage_success
+fi
+
 if [ ! -f config-bootstrap.done ]
 then
     record_service_stage_start "config-bootstrap"
@@ -102,6 +125,7 @@ then
 		--volume "$PWD:/assets:z" \
 		"${CONFIG_OPERATOR_IMAGE}" \
 		/usr/bin/cluster-config-operator render \
+		--skip-api-rendering \
 		--cluster-infrastructure-input-file=/assets/manifests/cluster-infrastructure-02-config.yml \
 		--cloud-provider-config-output-file=/assets/config-bootstrap/cloud-provider-config-generated.yaml \
 		--config-output-file=/assets/config-bootstrap/config \
@@ -111,8 +135,6 @@ then
 		--payload-version=$VERSION \
 		"${ADDITIONAL_FLAGS[@]}"
 
-	cp config-bootstrap/manifests/* manifests/
-
 	touch config-bootstrap.done
     record_service_stage_success
 fi