Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

Updates for 1.7 cadvisor changes and rbac requirements #73

Merged
merged 7 commits into from
Nov 7, 2018
Merged

Updates for 1.7 cadvisor changes and rbac requirements #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6a77c4
Fix issue with grafana-specific data not persisting
joshes Aug 30, 2017
f373df7
Add nodes/proxy to prometheus rbac permissions
Aug 31, 2017
fa46d7b
Update path to cadvisor as it was moved to the api instead of keeping…
Aug 31, 2017
566e063
Fix minor typo s/Interal/Internal/
Aug 31, 2017
7660601
Merge pull request #1 from joshes/bugfix/persistent-volume-issue
zatricky Aug 31, 2017
5030af4
rebuild universal manifests using latest configs
Aug 31, 2017
95191f7
Merge branch 'master' into master
pipo02mix Nov 7, 2018
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
Prev Previous commit
Merge branch 'master' into master
  • Loading branch information
@pipo02mix
pipo02mix authored Nov 7, 2018
commit 95191f72204ac50d181b6b3d36212c36ae085079
67 changes: 33 additions & 34 deletions manifests-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2797,40 +2797,39 @@ metadata:
name: prometheus-rules
namespace: monitoring
---
# ---
# apiVersion: rbac.authorization.k8s.io/v1beta1
# kind: ClusterRoleBinding
# metadata:
# name: prometheus
# roleRef:
# apiGroup: rbac.authorization.k8s.io
# kind: ClusterRole
# name: prometheus
# subjects:
# - kind: ServiceAccount
# name: prometheus-k8s
# namespace: monitoring
# ---
# apiVersion: rbac.authorization.k8s.io/v1beta1
# kind: ClusterRole
# metadata:
# name: prometheus
# rules:
# - apiGroups: [""]
# resources:
# - nodes
# - nodes/proxy
# - services
# - endpoints
# - pods
# verbs: ["get", "list", "watch"]
# - apiGroups: [""]
# resources:
# - configmaps
# verbs: ["get"]
# - nonResourceURLs: ["/metrics"]
# verbs: ["get"]
# ---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: prometheus
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: monitoring
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: prometheus
rules:
- apiGroups: [""]
resources:
- nodes
- nodes/proxy
- services
- endpoints
- pods
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources:
- configmaps
verbs: ["get"]
- nonResourceURLs: ["/metrics"]
verbs: ["get"]
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down
68 changes: 34 additions & 34 deletions manifests/prometheus/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# ---
# apiVersion: rbac.authorization.k8s.io/v1beta1
# kind: ClusterRoleBinding
# metadata:
# name: prometheus
# roleRef:
# apiGroup: rbac.authorization.k8s.io
# kind: ClusterRole
# name: prometheus
# subjects:
# - kind: ServiceAccount
# name: prometheus-k8s
# namespace: monitoring
# ---
# apiVersion: rbac.authorization.k8s.io/v1beta1
# kind: ClusterRole
# metadata:
# name: prometheus
# rules:
# - apiGroups: [""]
# resources:
# - nodes
# - nodes/proxy
# - services
# - endpoints
# - pods
# verbs: ["get", "list", "watch"]
# - apiGroups: [""]
# resources:
# - configmaps
# verbs: ["get"]
# - nonResourceURLs: ["/metrics"]
# verbs: ["get"]
# ---
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: prometheus
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: monitoring
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: prometheus
rules:
- apiGroups: [""]
resources:
- nodes
- nodes/proxy
- services
- endpoints
- pods
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources:
- configmaps
verbs: ["get"]
- nonResourceURLs: ["/metrics"]
verbs: ["get"]
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.