diff --git a/Dockerfile.rhel b/Dockerfile.rhel index df40d2734a..84aa2b4d33 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -10,5 +10,7 @@ COPY --from=builder /tmp/build/cluster-version-operator /tmp/build/cluster-versi COPY install /manifests COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/ COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/ +RUN echo '# include.release.openshift.io/bootstrap-cluster-version-operator: hypershift' >>/manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml && \ + echo '# include.release.openshift.io/bootstrap-cluster-version-operator: hypershift' >>/manifests/0000_00_cluster-version-operator_01_clusteroperators.crd.yaml COPY bootstrap /bootstrap ENTRYPOINT ["/usr/bin/cluster-version-operator"] diff --git a/install/0000_00_cluster-version-operator_00_namespace.yaml b/install/0000_00_cluster-version-operator_00_namespace.yaml index 00346c476f..7ac80f1405 100644 --- a/install/0000_00_cluster-version-operator_00_namespace.yaml +++ b/install/0000_00_cluster-version-operator_00_namespace.yaml @@ -5,6 +5,7 @@ metadata: annotations: kubernetes.io/description: The cluster-version operator manages OpenShift updates and reconciles core resources and cluster operators. include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/bootstrap-cluster-version-operator: hypershift openshift.io/node-selector: "" workload.openshift.io/allowed: "management" labels: diff --git a/install/0000_00_cluster-version-operator_02_roles.yaml b/install/0000_00_cluster-version-operator_02_roles.yaml index 9396aa6149..33a6787f35 100644 --- a/install/0000_00_cluster-version-operator_02_roles.yaml +++ b/install/0000_00_cluster-version-operator_02_roles.yaml @@ -5,6 +5,7 @@ metadata: annotations: kubernetes.io/description: Grant the cluster-version operator permission to perform cluster-admin actions while managing the OpenShift core. include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/bootstrap-cluster-version-operator: hypershift roleRef: kind: ClusterRole name: cluster-admin