Fix metrics server RBAC

AndresPineros · Sep 30, 2018 · ea1cb89 · ea1cb89
1 parent 9cf6fba
commit ea1cb89
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -3,6 +3,5 @@
 CHARTS = $(shell ls -d */ | grep -v charts)
 
 package:
-	$(foreach var,$(CHARTS),helm dep update $(var);)
 	helm package $(CHARTS) -d charts
 	helm repo index charts --merge charts/index.yaml
diff --git a/charts/efk-0.1.0.tgz b/charts/efk-0.1.0.tgz
diff --git a/charts/hpa-operator-0.0.5.tgz b/charts/hpa-operator-0.0.5.tgz
diff --git a/charts/index.yaml b/charts/index.yaml
@@ -3,7 +3,7 @@ entries:
   descheduler:
   - apiVersion: v1
     appVersion: v0.6.0
-    created: 2018-09-30T16:35:22.592860799+02:00
+    created: 2018-09-30T17:09:25.923937458+02:00
     description: A Helm chart for Kubernetes Descheduler
     digest: 9eddad77998b3d4632375bfb0b9a133bde4e4a47beaf57422aee4cba4db0d73d
     name: descheduler
@@ -12,7 +12,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: v0.5.0-4-ga7ceb671
-    created: 2018-09-30T16:35:22.592594243+02:00
+    created: 2018-09-30T17:09:25.923387173+02:00
     description: A Helm chart for Kubernetes Descheduler
     digest: 32ca0684f33dbfe61f265537e3c87d04c43e7ac9aafeb77f44397cbaa32f6bae
     name: descheduler
@@ -22,17 +22,17 @@ entries:
   efk:
   - apiVersion: v1
     appVersion: "1.0"
-    created: 2018-09-30T16:35:22.593884356+02:00
+    created: 2018-09-30T17:09:25.925800259+02:00
     description: A Helm chart for EFK stack
-    digest: e918ad64c644cf3148430c0aea4430a73a7aecc9f99bba83f1cf05661c728fed
+    digest: caef9bf0810a510360aa2f7d10f6f3a0d8dba92d6a1d98d56a5ef4df3bf8d6bb
     name: efk
     urls:
     - efk-0.1.0.tgz
     version: 0.1.0
   elasticsearch:
   - apiVersion: v1
     appVersion: 6.1.3
-    created: 2018-09-30T16:35:22.59488509+02:00
+    created: 2018-09-30T17:09:25.927373074+02:00
     description: A Helm chart for Elasticsearch cluster
     digest: eb8163d9a2153c5760e80b530a4ff8653c569b24a3cffd26a1f1be8a4e080179
     maintainers:
@@ -47,7 +47,7 @@ entries:
     version: 0.1.4
   - apiVersion: v1
     appVersion: 6.1.3
-    created: 2018-09-30T16:35:22.594621314+02:00
+    created: 2018-09-30T17:09:25.926886346+02:00
     description: A Helm chart for Elasticsearch cluster
     digest: 32a25b05c73cc92b49fc53b64d25cee44d28e1062db1ef12f2cbcb0e260d0019
     maintainers:
@@ -63,7 +63,7 @@ entries:
   elasticsearch-operator:
   - apiVersion: v1
     appVersion: 0.0.12
-    created: 2018-09-30T16:35:22.596354056+02:00
+    created: 2018-09-30T17:09:25.929668346+02:00
     description: A Helm chart for Elasticsearch operator
     digest: 5b946ae9c69685e80964599cadfcf1b675b124eb393471ee0f335e63eb572024
     maintainers:
@@ -78,7 +78,7 @@ entries:
     version: 0.1.5
   - apiVersion: v1
     appVersion: 0.0.12
-    created: 2018-09-30T16:35:22.596090944+02:00
+    created: 2018-09-30T17:09:25.929195217+02:00
     description: A Helm chart for Elasticsearch operator
     digest: f909a7a19ec3e04259a40728c7428515701aed1f8cae7407c8b6a993b6e083d8
     maintainers:
@@ -93,7 +93,7 @@ entries:
     version: 0.1.4
   - apiVersion: v1
     appVersion: 0.0.10
-    created: 2018-09-30T16:35:22.595426278+02:00
+    created: 2018-09-30T17:09:25.928302327+02:00
     description: A Helm chart for Elasticsearch operator
     digest: dea5f18a301f11dee2aef9ac1dd3b44069e4bc128c8c32f8e1322a55a385a282
     maintainers:
@@ -107,9 +107,9 @@ entries:
     - elasticsearch-operator-0.1.3.tgz
     version: 0.1.3
   hpa-operator:
-  - created: 2018-09-30T16:35:22.596804003+02:00
+  - created: 2018-09-30T17:09:25.930460209+02:00
     description: A Helm chart for Kubernetes
-    digest: 5ebfbb9595d4cd83bea6be1f025c39d4d4c37381cf03a1e4520e52007a1176e3
+    digest: 3710121df9bab55fbec2113aab32902b472ed4b0bff4638c870acecd469cbfc2
     home: https://banzaicloud.com
     keywords:
     - hpa
@@ -127,7 +127,7 @@ entries:
   k8s-spot-rescheduler:
   - apiVersion: v1
     appVersion: v0.2.0
-    created: 2018-09-30T16:35:22.598047392+02:00
+    created: 2018-09-30T17:09:25.932220902+02:00
     description: A k8s-spot-rescheduler Helm chart for Kubernetes
     digest: efa17ca0d214dd037427682b8096ab8c47ffa9160e2f0abb490121900cf4db53
     home: https://github.com/pusher/k8s-spot-rescheduler
@@ -145,7 +145,7 @@ entries:
     version: 0.3.0
   - apiVersion: v1
     appVersion: v0.1.1
-    created: 2018-09-30T16:35:22.597706198+02:00
+    created: 2018-09-30T17:09:25.931526839+02:00
     description: A k8s-spot-rescheduler Helm chart for Kubernetes
     digest: 255c56c1e35296a45dee14e8d069210a3c8ef4865b44b01b2378f3b8c1423bd2
     home: https://github.com/pusher/k8s-spot-rescheduler
@@ -163,7 +163,7 @@ entries:
     version: 0.2.0
   kibana:
   - appVersion: 6.1.3
-    created: 2018-09-30T16:35:22.598428553+02:00
+    created: 2018-09-30T17:09:25.93306689+02:00
     description: Kibana is an open source data visualization plugin for Elasticsearch
     digest: 17482b8ec6895ab271666a834223554857490c36acc449e87b2ba4b134b3e704
     engine: gotpl
@@ -186,9 +186,9 @@ entries:
   metrics-server:
   - apiVersion: v1
     appVersion: 0.3.1
-    created: 2018-09-30T16:35:22.598743009+02:00
+    created: 2018-09-30T17:09:25.933837071+02:00
     description: Metrics Server is a cluster-wide aggregator of resource usage data.
-    digest: 9e665061a94a0379ab564500b4ffaee8098f3b252cf25fc231d75242df99cad5
+    digest: e1e211705364a6e7ef19fda4faec4fa316a946280f32f296cb0f65bb3880852e
     home: https://github.com/kubernetes-incubator/metrics-server
     keywords:
     - metrics-server
@@ -202,4 +202,4 @@ entries:
     urls:
     - metrics-server-0.0.5.tgz
     version: 0.0.5
-generated: 2018-09-30T16:35:22.591718511+02:00
+generated: 2018-09-30T17:09:25.921589832+02:00
diff --git a/charts/metrics-server-0.0.5.tgz b/charts/metrics-server-0.0.5.tgz
diff --git a/hpa-operator/charts/metrics-server-0.0.5.tgz b/hpa-operator/charts/metrics-server-0.0.5.tgz
diff --git a/hpa-operator/requirements.lock b/hpa-operator/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: file://../metrics-server
   version: 0.0.5
 digest: sha256:d370ab37cdf2842869d08e8e9e743e99e2e3d75f0206a41b735f19a7466ecd6c
-generated: 2018-09-30T16:31:50.185598231+02:00
+generated: 2018-09-30T17:07:57.177853314+02:00
diff --git a/metrics-server/templates/clusterrolebinding.yaml b/metrics-server/templates/clusterrolebinding.yaml
@@ -13,6 +13,24 @@ roleRef:
   kind: ClusterRole
   name: {{ template "metrics-server.fullname" . }}
 subjects:
+- kind: ServiceAccount
+  name: {{ template "metrics-server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "metrics-server.fullname" . }}:system:auth-delegator
+  labels:
+    app: {{ template "metrics-server.name" . }}
+    chart: {{ template "metrics-server.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
 - kind: ServiceAccount
   name: {{ template "metrics-server.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}

diff --git a/metrics-server/templates/rolebinding.yaml b/metrics-server/templates/rolebinding.yaml
@@ -11,7 +11,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "metrics-server.fullname" . }}
+  name: extension-apiserver-authentication-reader
 subjects:
 - kind: ServiceAccount
   name: {{ template "metrics-server.serviceAccountName" . }}