From 21fb8a41b54bc86c5c4186ce36228b5694af0f0c Mon Sep 17 00:00:00 2001 From: enxebre Date: Wed, 3 May 2023 10:53:48 +0200 Subject: [PATCH] Add new --featuregate-manifest to /usr/bin/cluster-config-operator render CI is currently borken https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/periodic-ci-openshift-hypershift-release-4.14-periodics-e2e-aws-ovn/1653511338548269056/artifacts/e2e-aws-ovn/run-e2e/artifacts/TestCreateCluster_PreTeardownClusterDump/namespaces/e2e-clusters-glkxm-example-qmb9l/core/pods/logs/kube-apiserver-79b6c48d7-mzv44-init-bootstrap-previous.log. This introduced a new command which is effectively required https://github.com/openshift/cluster-config-operator/pull/288 Here it was added to the installer github.com/openshift/installer/pull/6990 --- .../hostedcontrolplane/kas/deployment.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/control-plane-operator/controllers/hostedcontrolplane/kas/deployment.go b/control-plane-operator/controllers/hostedcontrolplane/kas/deployment.go index 5ae800682149..45d4800403ac 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/kas/deployment.go +++ b/control-plane-operator/controllers/hostedcontrolplane/kas/deployment.go @@ -664,11 +664,23 @@ func applyCloudConfigVolumeMount(configRef *corev1.LocalObjectReference, podSpec func invokeBootstrapRenderScript(workDir string) string { var script = `#!/bin/sh cd /tmp -mkdir input output +mkdir input output manifests + +touch /tmp/manifests/99_feature-gate.yaml +cat </tmp/manifests/99_feature-gate.yaml +apiVersion: config.openshift.io/v1 +kind: FeatureGate +metadata: + name: cluster +spec: {} +EOF + /usr/bin/cluster-config-operator render \ --config-output-file config \ --asset-input-dir /tmp/input \ - --asset-output-dir /tmp/output + --asset-output-dir /tmp/output \ + --rendered-manifest-files=/tmp/manifests \ + --featuregate-manifest=/tmp/manifests/99_feature-gate.yaml cp /tmp/output/manifests/* %[1]s ` return fmt.Sprintf(script, workDir)