diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template index e5116c75749..6f0dea622e8 100755 --- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template +++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template @@ -48,7 +48,6 @@ MACHINE_CONFIG_ETCD_IMAGE=$(image_for etcd) MACHINE_CONFIG_INFRA_IMAGE=$(image_for pod) CLUSTER_ETCD_OPERATOR_IMAGE=$(image_for cluster-etcd-operator) -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) KUBE_SCHEDULER_OPERATOR_IMAGE=$(image_for cluster-kube-scheduler-operator) @@ -86,38 +85,6 @@ fi VERSION="$(oc adm release info -o 'jsonpath={.metadata.version}' "${MIRROR_FLAG}" "${RELEASE_IMAGE_DIGEST}")" -if [ ! -f config-bootstrap.done ] -then - record_service_stage_start "config-bootstrap" - echo "Rendering cluster config manifests..." - - rm --recursive --force config-bootstrap - - ADDITIONAL_FLAGS=() - if [ -f "$PWD/manifests/cloud-provider-config.yaml" ]; then - ADDITIONAL_FLAGS+=("--cloud-provider-config-input-file=/assets/manifests/cloud-provider-config.yaml") - fi - - bootkube_podman_run \ - --name config-render \ - --volume "$PWD:/assets:z" \ - "${CONFIG_OPERATOR_IMAGE}" \ - /usr/bin/cluster-config-operator render \ - --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 \ - --asset-input-dir=/assets/tls \ - --asset-output-dir=/assets/config-bootstrap \ - --rendered-manifest-files=/assets/manifests \ - --payload-version=$VERSION \ - "${ADDITIONAL_FLAGS[@]}" - - cp config-bootstrap/manifests/* manifests/ - - touch config-bootstrap.done - record_service_stage_success -fi - if [ ! -f cvo-bootstrap.done ] then record_service_stage_start "cvo-bootstrap"