Skip to content

CNTRLPLANE-378: Run kas-bootstrap binary for cpov2 #5947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 1, 2025
Merged

CNTRLPLANE-378: Run kas-bootstrap binary for cpov2 #5947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 8 additions & 33 deletions ...ers/hostedcontrolplane/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -383,7 +358,7 @@ spec:
featureGates: null
image: cluster-config-api
imagePullPolicy: IfNotPresent
name: init-bootstrap
name: init-bootstrap-render
resources:
requests:
cpu: 30m
Expand Down
41 changes: 8 additions & 33 deletions ...e/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -384,7 +359,7 @@ spec:
featureGates: null
image: cluster-config-api
imagePullPolicy: IfNotPresent
name: init-bootstrap
name: init-bootstrap-render
resources:
requests:
cpu: 30m
Expand Down
41 changes: 8 additions & 33 deletions ...ol-plane-operator/controllers/hostedcontrolplane/v2/assets/kube-apiserver/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -282,7 +257,7 @@ spec:
- /bin/bash
image: cluster-config-api
imagePullPolicy: IfNotPresent
name: init-bootstrap
name: init-bootstrap-render
resources:
requests:
cpu: 30m
Expand Down
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/v2/kas/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down