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.

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

Jump to bottom

[release-4.6] Bug 1885463: Fix ovnkube metrics #826

Merged
merged 1 commit into from
Oct 6, 2020
Merged

[release-4.6] Bug 1885463: Fix ovnkube metrics #826

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions bindata/network/ovn-kubernetes/002-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ rules:
- get
- list
- watch
- apiGroups: ['authentication.k8s.io']
resources: ['tokenreviews']
verbs: ['create']
- apiGroups: ['authorization.k8s.io']
resources: ['subjectaccessreviews']
verbs: ['create']

---
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
57 changes: 6 additions & 51 deletions bindata/network/ovn-kubernetes/003-rbac-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ rules:
- get
- list
- watch
- apiGroups: ['authentication.k8s.io']
resources: ['tokenreviews']
verbs: ['create']
- apiGroups: ['authorization.k8s.io']
resources: ['subjectaccessreviews']
verbs: ['create']


---
Expand Down Expand Up @@ -133,54 +139,3 @@ subjects:
- kind: ServiceAccount
name: ovn-kubernetes-controller
namespace: openshift-ovn-kubernetes

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: openshift-ovn-kubernetes-metrics
rules:
- apiGroups: [""]
resources:
- namespaces
- endpoints
- services
- pods
verbs:
- get
- list
- watch
- apiGroups: [""]
resources:
- events
verbs:
- create
- patch
- update
- apiGroups: ['authentication.k8s.io']
resources: ['tokenreviews']
verbs: ['create']
- apiGroups: ['authorization.k8s.io']
resources: ['subjectaccessreviews']
verbs: ['create']

---
apiVersion: v1
kind: ServiceAccount
metadata:
name: openshift-ovn-kubernetes-metrics
namespace: openshift-ovn-kubernetes

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: openshift-ovn-kubernetes-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: openshift-ovn-kubernetes-metrics
subjects:
- kind: ServiceAccount
name: openshift-ovn-kubernetes-metrics
namespace: openshift-ovn-kubernetes
2 changes: 1 addition & 1 deletion bindata/network/ovn-kubernetes/alert-rules-control-plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
message: |
There is no running ovn-kubernetes master
expr: |
absent(up{job="ovnkube-master-metrics", namespace="openshift-ovn-kubernetes"} == 1)
absent(up{job="ovnkube-master", namespace="openshift-ovn-kubernetes"} == 1)
for: 10m
labels:
severity: warning
Expand Down
4 changes: 2 additions & 2 deletions bindata/network/ovn-kubernetes/monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: ovn-kubernetes-master-metrics.openshift-ovn-kubernetes.svc
serverName: ovn-kubernetes-master.openshift-ovn-kubernetes.svc
jobLabel: app
namespaceSelector:
matchNames:
Expand Down Expand Up @@ -65,7 +65,7 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: ovn-kubernetes-node-metrics.openshift-ovn-kubernetes.svc
serverName: ovn-kubernetes-node.openshift-ovn-kubernetes.svc
jobLabel: app
namespaceSelector:
matchNames:
Expand Down