Skip to content

OCPBUGS-78832: install: Annotate HyperShift bootstrap manifests with include.release.openshift.io/bootstrap-cluster-version-operator #1352

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

Open
wking wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-78832: install: Annotate HyperShift bootstrap manifests with include.release.openshift.io/bootstrap-cluster-version-operator #1352

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
2 changes: 2 additions & 0 deletions Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions install/0000_00_cluster-version-operator_00_namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions install/0000_00_cluster-version-operator_02_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down