Skip to content

Annotate manifests for single-node-developer cluster profile #78

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-robot merged 1 commit into from
Dec 2, 2020
Merged

Annotate manifests for single-node-developer cluster profile #78

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
1 change: 1 addition & 0 deletions config/profiles/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
commonAnnotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"

bases:
- ../../crd
Expand Down
2 changes: 1 addition & 1 deletion controllers/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions controllers/clusteroperator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func TestEnsureClusterOperator(t *testing.T) {
Name: clusterOperatorName,
Annotations: map[string]string{
"include.release.openshift.io/self-managed-high-availability": "true",
"include.release.openshift.io/single-node-developer": "true",
},
OwnerReferences: []v1.OwnerReference{
{
Expand All @@ -147,6 +148,7 @@ func TestEnsureClusterOperator(t *testing.T) {
Name: clusterOperatorName,
Annotations: map[string]string{
"include.release.openshift.io/self-managed-high-availability": "true",
"include.release.openshift.io/single-node-developer": "true",
},
},
Status: osconfigv1.ClusterOperatorStatus{
Expand All @@ -158,6 +160,7 @@ func TestEnsureClusterOperator(t *testing.T) {
Name: clusterOperatorName,
Annotations: map[string]string{
"include.release.openshift.io/self-managed-high-availability": "true",
"include.release.openshift.io/single-node-developer": "true",
},
OwnerReferences: []v1.OwnerReference{
{
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
namespace: openshift-machine-api
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
data:
images.json: >
{
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
name: provisionings.metal3.io
spec:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_03_baremetalhost.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: baremetalhosts.metal3.io
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
group: metal3.io
names:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_04_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ metadata:
namespace: openshift-machine-api
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
4 changes: 4 additions & 0 deletions manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Role
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
name: cluster-baremetal-operator
namespace: openshift-machine-api
Expand Down Expand Up @@ -72,6 +73,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
name: cluster-baremetal-operator
rules:
Expand Down Expand Up @@ -180,6 +182,7 @@ kind: RoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: cluster-baremetal-operator
namespace: openshift-machine-api
roleRef:
Expand All @@ -196,6 +199,7 @@ kind: ClusterRoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: cluster-baremetal-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Copy link
Contributor

@asalkeld asalkeld Nov 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect "make manifests" is going to overwite this. maybe add it here https://github.com/openshift/cluster-baremetal-operator/blob/master/config/profiles/default/kustomization.yaml#L2

Copy link
Contributor Author

@guillaumerose guillaumerose Dec 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, thanks!

labels:
k8s-app: cluster-baremetal-operator
name: cluster-baremetal-operator
Expand All @@ -17,6 +18,7 @@ spec:
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
labels:
k8s-app: cluster-baremetal-operator
spec:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_07_clusteroperator.cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: baremetal
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec: {}
status:
versions:
Expand Down