Skip to content
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.

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

add current profile annotations to CVO manifests #235

Merged
merged 1 commit into from
Oct 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/02-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Namespace
metadata:
name: openshift-insights
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
openshift.io/cluster-monitoring: "true"
Expand Down
22 changes: 22 additions & 0 deletions manifests/03-clusterrole.yaml
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: insights-operator-auth
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: system:auth-delegator
Expand All @@ -15,6 +17,8 @@ kind: RoleBinding
metadata:
name: insights-operator-auth
namespace: kube-system
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: Role
name: extension-apiserver-authentication-reader
Expand All @@ -28,6 +32,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: insights-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
# allow the operator to update cluster operator status
- apiGroups:
Expand Down Expand Up @@ -68,6 +74,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: insights-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: insights-operator
Expand All @@ -81,6 +89,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: insights-operator-gather
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -149,6 +159,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: insights-operator-gather
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: insights-operator-gather
Expand All @@ -162,6 +174,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: insights-operator-gather-reader
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: cluster-reader
Expand All @@ -176,6 +190,8 @@ kind: Role
metadata:
name: insights-operator
namespace: openshift-config
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand All @@ -192,6 +208,8 @@ kind: RoleBinding
metadata:
name: insights-operator
namespace: openshift-config
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: Role
name: insights-operator
Expand All @@ -206,6 +224,8 @@ kind: Role
metadata:
name: insights-operator
namespace: openshift-insights
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand All @@ -227,6 +247,8 @@ kind: RoleBinding
metadata:
name: insights-operator
namespace: openshift-insights
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: Role
name: insights-operator
Expand Down
2 changes: 2 additions & 0 deletions manifests/03-prometheus_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: Role
metadata:
name: prometheus-k8s
namespace: openshift-insights
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand Down
2 changes: 2 additions & 0 deletions manifests/03-prometheus_rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-insights
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/04-proxy-cert-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
namespace: openshift-insights
name: trusted-ca-bundle
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
1 change: 1 addition & 0 deletions manifests/04-service-ca-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ metadata:
namespace: openshift-insights
name: service-ca-bundle
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
service.beta.openshift.io/inject-cabundle: "true"
4 changes: 4 additions & 0 deletions manifests/04-serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ kind: ServiceAccount
metadata:
namespace: openshift-insights
name: operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
---
apiVersion: v1
kind: ServiceAccount
metadata:
namespace: openshift-insights
name: gather
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
3 changes: 2 additions & 1 deletion manifests/05-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: v1
kind: Service
metadata:
annotations:
service.alpha.openshift.io/serving-cert-secret-name: openshift-insights-serving-cert
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: openshift-insights-serving-cert
labels:
app: insights-operator
name: metrics
Expand Down
1 change: 1 addition & 0 deletions manifests/06-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: insights-operator
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
strategy:
type: Recreate
Expand Down
1 change: 1 addition & 0 deletions manifests/07-cluster-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: insights
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec: {}
status:
versions:
Expand Down
1 change: 1 addition & 0 deletions manifests/07-servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
namespace: openshift-insights
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand Down