Merge pull request #5947 from enxebre/kas-bootstrap-cpov2

CNTRLPLANE-378: Run kas-bootstrap binary for cpov2

Author: openshift-merge-bot[bot]

control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents.yaml

@@ -81,42 +81,17 @@ spec:
             topologyKey: kubernetes.io/hostname
       automountServiceAccountToken: false
       containers:
-      - args:
-        - -c
-        - |
-          #!/bin/sh
-          function cleanup() {
-            pkill -P $$$
-            wait
-            exit
-          }
-          trap cleanup SIGTERM
-          while true; do
-            if oc apply -f /work; then
-              echo "Bootstrap manifests applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            if oc replace --subresource=status -f /work/99_feature-gate.yaml; then
-              echo "FeatureGate status applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            sleep 1000 &
-            wait $!
-          done
-        command:
-        - /bin/bash
+      - command:
+        - /usr/bin/control-plane-operator
+        - kas-bootstrap
+        - --resources-path
+        - /work
         env:
         - name: KUBECONFIG
           value: /var/secrets/localhost-kubeconfig/kubeconfig
-        image: cli
+        image: controlplane-operator
         imagePullPolicy: IfNotPresent
-        name: apply-bootstrap
+        name: bootstrap
         resources:
           requests:
             cpu: 10m
@@ -383,7 +358,7 @@ spec:
               featureGates: null
         image: cluster-config-api
         imagePullPolicy: IfNotPresent
-        name: init-bootstrap
+        name: init-bootstrap-render
         resources:
           requests:
             cpu: 30m

control-plane-operator/controllers/hostedcontrolplane/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml

@@ -81,42 +81,17 @@ spec:
             topologyKey: kubernetes.io/hostname
       automountServiceAccountToken: false
       containers:
-      - args:
-        - -c
-        - |
-          #!/bin/sh
-          function cleanup() {
-            pkill -P $$$
-            wait
-            exit
-          }
-          trap cleanup SIGTERM
-          while true; do
-            if oc apply -f /work; then
-              echo "Bootstrap manifests applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            if oc replace --subresource=status -f /work/99_feature-gate.yaml; then
-              echo "FeatureGate status applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            sleep 1000 &
-            wait $!
-          done
-        command:
-        - /bin/bash
+      - command:
+        - /usr/bin/control-plane-operator
+        - kas-bootstrap
+        - --resources-path
+        - /work
         env:
         - name: KUBECONFIG
           value: /var/secrets/localhost-kubeconfig/kubeconfig
-        image: cli
+        image: controlplane-operator
         imagePullPolicy: IfNotPresent
-        name: apply-bootstrap
+        name: bootstrap
         resources:
           requests:
             cpu: 10m
@@ -384,7 +359,7 @@ spec:
               featureGates: null
         image: cluster-config-api
         imagePullPolicy: IfNotPresent
-        name: init-bootstrap
+        name: init-bootstrap-render
         resources:
           requests:
             cpu: 30m

control-plane-operator/controllers/hostedcontrolplane/v2/assets/kube-apiserver/deployment.yaml

@@ -20,42 +20,17 @@ spec:
         app: kube-apiserver
     spec:
       containers:
-      - args:
-        - -c
-        - |
-          #!/bin/sh
-          function cleanup() {
-            pkill -P $$$
-            wait
-            exit
-          }
-          trap cleanup SIGTERM
-          while true; do
-            if oc apply -f /work; then
-              echo "Bootstrap manifests applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            if oc replace --subresource=status -f /work/99_feature-gate.yaml; then
-              echo "FeatureGate status applied successfully."
-              break
-            fi
-            sleep 1
-          done
-          while true; do
-            sleep 1000 &
-            wait $!
-          done
-        command:
-        - /bin/bash
+      - command:
+        - /usr/bin/control-plane-operator
+        - kas-bootstrap
+        - --resources-path
+        - /work
         env:
         - name: KUBECONFIG
           value: /var/secrets/localhost-kubeconfig/kubeconfig
-        image: cli
+        image: controlplane-operator
         imagePullPolicy: IfNotPresent
-        name: apply-bootstrap
+        name: bootstrap
         resources:
           requests:
             cpu: 10m
@@ -282,7 +257,7 @@ spec:
         - /bin/bash
         image: cluster-config-api
         imagePullPolicy: IfNotPresent
-        name: init-bootstrap
+        name: init-bootstrap-render
         resources:
           requests:
             cpu: 30m

control-plane-operator/controllers/hostedcontrolplane/v2/kas/deployment.go

@@ -208,7 +208,7 @@ func updateBootstrapInitContainer(deployment *appsv1.Deployment, hcp *hyperv1.Ho
 	}
 	featureGateYaml := featureGateBuffer.String()
 
-	util.UpdateContainer("init-bootstrap", deployment.Spec.Template.Spec.InitContainers, func(c *corev1.Container) {
+	util.UpdateContainer("init-bootstrap-render", deployment.Spec.Template.Spec.InitContainers, func(c *corev1.Container) {
 		c.Env = append(c.Env,
 			corev1.EnvVar{
 				Name:  "PAYLOAD_VERSION",