Bump metrics-server to v0.6.1

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/289/head
Brad Davidson 2022-09-28 19:37:11 +00:00 committed by Brad Davidson
parent c097a061bc
commit c3332ecc78
5 changed files with 50 additions and 5 deletions

View File

@ -3,7 +3,7 @@
@@ -1,5 +1,5 @@
apiVersion: v1
-appVersion: 0.3.6
+appVersion: 0.5.0
+appVersion: 0.6.1
description: Metrics Server is a cluster-wide aggregator of resource usage data.
home: https://github.com/kubernetes-incubator/metrics-server
keywords:
@ -16,4 +16,4 @@
sources:
- https://github.com/kubernetes-incubator/metrics-server
-version: 2.11.1
+version: 2.11.100-build20211119
+version: 2.11.100-build20220928

View File

@ -0,0 +1,30 @@
--- charts-original/templates/cluster-role.yaml
+++ charts/templates/cluster-role.yaml
@@ -12,14 +12,20 @@
- apiGroups:
- ""
resources:
- - pods
- - nodes
- - nodes/stats
- - namespaces
+ - nodes/metrics
verbs:
- - get
- - list
- - watch
+ - get
+ - apiGroups:
+ - ""
+ resources:
+ - pods
+ - nodes
+ - nodes/stats
+ - namespaces
+ verbs:
+ - get
+ - list
+ - watch
{{- if .Values.rbac.pspEnabled }}
- apiGroups:
- extensions

View File

@ -1,6 +1,6 @@
--- charts-original/templates/metrics-server-deployment.yaml
+++ charts/templates/metrics-server-deployment.yaml
@@ -47,7 +47,7 @@
@@ -47,18 +47,20 @@
{{- ( tpl (toYaml .Values.extraContainers) . ) | nindent 8 }}
{{- end }}
- name: metrics-server
@ -9,3 +9,18 @@
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- /metrics-server
- --cert-dir=/tmp
- --logtostderr
- - --secure-port=8443
+ - --secure-port=10250
+ - --kubelet-use-node-status-port
+ - --metric-resolution=15s
{{- range .Values.args }}
- {{ . }}
{{- end }}
ports:
- - containerPort: 8443
+ - containerPort: 10250
name: https
livenessProbe:
{{- toYaml .Values.livenessProbe | trim | nindent 12 }}

View File

@ -7,7 +7,7 @@
- repository: k8s.gcr.io/metrics-server-amd64
- tag: v0.3.6
+ repository: rancher/hardened-k8s-metrics-server
+ tag: v0.5.0-build20211119
+ tag: v0.6.1-build20220928
pullPolicy: IfNotPresent
imagePullSecrets: []

View File

@ -1,3 +1,3 @@
url: https://charts.helm.sh/stable/packages/metrics-server-2.11.1.tgz
packageVersion: 04
packageVersion: 05
releaseCandidateVersion: 00