Skip to content

Add baremetal capability annotations #249

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
Mar 25, 2022
Merged

Add baremetal capability annotations #249

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/cluster-baremetal-operator/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
commonAnnotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: baremetal

resources:
- cluster-baremetal-operator.yaml
1 change: 1 addition & 0 deletions config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
commonAnnotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: baremetal

# This kustomization.yaml is not intended to be run by itself,
# since it depends on service name and namespace that are out of this kustomize package.
Expand Down
1 change: 1 addition & 0 deletions config/prometheus/monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ServiceMonitor
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
capability.openshift.io/name: baremetal
labels:
k8s-app: cluster-baremetal-operator
name: cluster-baremetal-operator-servicemonitor
Expand Down
1 change: 1 addition & 0 deletions config/prometheus/proxyconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
namespace: openshift-machine-api
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: baremetal
data:
config-file.yaml: |+
authorization:
Expand Down
2 changes: 2 additions & 0 deletions config/prometheus/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
namespace: openshift-machine-api
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: baremetal
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand All @@ -23,6 +24,7 @@ metadata:
namespace: openshift-machine-api
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: baremetal
rules:
- apiGroups:
- ""
Expand Down
1 change: 1 addition & 0 deletions config/prometheus/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
service.alpha.openshift.io/serving-cert-secret-name: cluster-baremetal-operator-tls
capability.openshift.io/name: baremetal
labels:
k8s-app: cluster-baremetal-operator
spec:
Expand Down
1 change: 1 addition & 0 deletions config/rbac/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
commonAnnotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: baremetal

resources:
- role.yaml
Expand Down
1 change: 1 addition & 0 deletions config/webhook/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
commonAnnotations:
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: baremetal

resources:
- service.yaml
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.

1 change: 1 addition & 0 deletions controllers/clusteroperator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ func TestEnsureClusterOperator(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: clusterOperatorName,
Annotations: map[string]string{
"capability.openshift.io/name": "baremetal",
"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",
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 @@ -5,6 +5,7 @@ metadata:
name: cluster-baremetal-operator-images
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
data:
Expand Down
3 changes: 2 additions & 1 deletion manifests/0000_31_cluster-baremetal-operator_01_trusted-ca-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
name: cbo-trusted-ca
namespace: openshift-machine-api
namespace: openshift-machine-api
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 @@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_03_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
capability.openshift.io/name: baremetal
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
service.alpha.openshift.io/serving-cert-secret-name: cluster-baremetal-operator-tls
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_03_webhookservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
service.beta.openshift.io/serving-cert-secret-name: cluster-baremetal-webhook-server-cert
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 @@ -4,6 +4,7 @@ metadata:
name: cluster-baremetal-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: baremetal
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"
1 change: 1 addition & 0 deletions manifests/0000_31_cluster-baremetal-operator_05_kube-rbac-proxy-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ data:
kind: ConfigMap
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
name: kube-rbac-proxy
namespace: openshift-machine-api
2 changes: 2 additions & 0 deletions manifests/0000_31_cluster-baremetal-operator_05_prometheus_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
name: prometheus-k8s-cluster-baremetal-operator
namespace: openshift-machine-api
Expand All @@ -18,6 +19,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
name: prometheus-k8s-cluster-baremetal-operator
namespace: openshift-machine-api
Expand Down
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 @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
Expand Down Expand Up @@ -64,6 +65,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
Expand Down Expand Up @@ -280,6 +282,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: cluster-baremetal-operator
Expand All @@ -297,6 +300,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: cluster-baremetal-operator
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 @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
capability.openshift.io/name: baremetal
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"
Expand All @@ -17,6 +18,7 @@ spec:
template:
metadata:
annotations:
capability.openshift.io/name: baremetal
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
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 @@ -3,6 +3,7 @@ kind: ClusterOperator
metadata:
name: baremetal
annotations:
capability.openshift.io/name: baremetal
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"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_cluster-baremetal-operator_03_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
annotations:
capability.openshift.io/name: baremetal
exclude.release.openshift.io/internal-openshift-hosted: "true"
labels:
k8s-app: cluster-baremetal-operator
Expand Down