Skip to content

bug 1871890: add current profile annotations to CVO manifests #156

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
Sep 24, 2020
Merged

bug 1871890: add current profile annotations to CVO manifests #156

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 manifests/0000_10_config-operator_01_openshift-config-managed-ns.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: Namespace
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
name: openshift-config-managed
labels:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_10_config-operator_01_openshift-config-ns.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: Namespace
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
name: openshift-config
labels:
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_10_config-operator_02_config.clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
labels:
rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
name: system:openshift:cluster-config-operator:cluster-reader
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_30_config-operator_00_namespace.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: Namespace
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
openshift.io/cluster-monitoring: "true"
Expand Down
3 changes: 2 additions & 1 deletion manifests/0000_30_config-operator_01_operator.cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Config
metadata:
name: cluster
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
spec:
managementState: Managed
managementState: Managed
2 changes: 2 additions & 0 deletions manifests/0000_30_config-operator_01_prometheusrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ metadata:
# TODO this should be a clusterrole
name: prometheus-k8s
namespace: openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_30_config-operator_02_prometheusrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_30_config-operator_02_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:
include.release.openshift.io/self-managed-high-availability: "true"
service.alpha.openshift.io/serving-cert-secret-name: config-operator-serving-cert
labels:
app: openshift-config-operator
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_30_config-operator_03_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ServiceMonitor
metadata:
name: config-operator
namespace: openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_30_config-operator_04_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:openshift:operator:openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: cluster-admin
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_30_config-operator_05_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ kind: ServiceAccount
metadata:
namespace: openshift-config-operator
name: openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
labels:
app: openshift-config-operator
1 change: 1 addition & 0 deletions manifests/0000_30_config-operator_07_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app: openshift-config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
replicas: 1
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_30_config-operator_08_clusteroperator.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: config-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec: {}
status:
Expand Down