diff --git a/chart/k8s-pause/Chart.yaml b/chart/k8s-pause/Chart.yaml index 95cb237..be8419b 100644 --- a/chart/k8s-pause/Chart.yaml +++ b/chart/k8s-pause/Chart.yaml @@ -14,4 +14,4 @@ keywords: name: k8s-pause sources: - https://github.com/DoodleScheduling/k8s-pause -version: 0.2.6 +version: 0.2.7 diff --git a/chart/k8s-pause/templates/deployment.yaml b/chart/k8s-pause/templates/deployment.yaml index 3ed03b5..bf9cdaf 100644 --- a/chart/k8s-pause/templates/deployment.yaml +++ b/chart/k8s-pause/templates/deployment.yaml @@ -91,7 +91,7 @@ spec: - --upstream=http://127.0.0.1:{{ .Values.metricsPort }} - --logtostderr=true - --v=0 - image: quay.io/brancz/kube-rbac-proxy:v0.14.0 + image: {{ .Values.kubeRBACProxy.image }} imagePullPolicy: IfNotPresent name: kube-rbac-proxy ports: diff --git a/chart/k8s-pause/templates/metrics-rbac.yaml b/chart/k8s-pause/templates/metrics-rbac.yaml index a36870d..2f54b31 100644 --- a/chart/k8s-pause/templates/metrics-rbac.yaml +++ b/chart/k8s-pause/templates/metrics-rbac.yaml @@ -16,6 +16,24 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding +metadata: + name: {{ include "k8s-pause.fullname" . }}-metrics + labels: + app.kubernetes.io/name: {{ include "k8s-pause.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ include "k8s-pause.chart" . }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ include "k8s-pause.fullname" . }}-metrics-reader +subjects: +- kind: ServiceAccount + name: {{ template "k8s-pause.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding metadata: name: {{ include "k8s-pause.fullname" . }}-proxy labels: diff --git a/chart/k8s-pause/values.yaml b/chart/k8s-pause/values.yaml index 64b5a62..680fbf6 100644 --- a/chart/k8s-pause/values.yaml +++ b/chart/k8s-pause/values.yaml @@ -140,7 +140,7 @@ prometheusRule: kubeRBACProxy: enabled: true - + image: quay.io/brancz/kube-rbac-proxy:v0.14.2 securityContext: allowPrivilegeEscalation: false capabilities: @@ -148,5 +148,11 @@ kubeRBACProxy: readOnlyRootFilesystem: true resources: {} + # limits: + # cpu: 500m + # memory: 128Mi + # requests: + # cpu: 5m + # memory: 64Mi tolerations: []