Merge pull request #1244 from stevehipwell/chart-v3-10-0

Release Helm Chart v3.10.0
kubernetes-sigs · Apr 12, 2023 · 3b88170 · 3b88170
2 parents 5748099 + ecf98e9
commit 3b88170
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 11 deletions.
diff --git a/charts/metrics-server/Chart.yaml b/charts/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: metrics-server
 description: Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
 type: application
-version: 3.9.0
+version: 3.10.0
 appVersion: 0.6.3
 keywords:
   - kubernetes
@@ -21,9 +21,11 @@ maintainers:
     url: https://github.com/endrec
 annotations:
   artifacthub.io/changes: |
+    - kind: fixed
+      description: "Fixed auth-reader role binding namespace to always use kube-system."
+    - kind: fixed
+      description: "Fixed addon resizer configuration."
     - kind: added
-      description: "Added autoscaling support via the addon-resizer."
-    - kind: changed
-      description: "Updated the Metrics Server OCI image to v0.6.3."
+      description: "Added support for running under PodSecurity restricted."
     - kind: fixed
-      description: "Fixed service labels/annotations."
+      description: "Fixed container port default not having been updated to 10250."
diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
@@ -78,6 +78,20 @@ The image to use for the addon resizer
 {{- printf "%s:%s" .Values.addonResizer.image.repository .Values.addonResizer.image.tag }}
 {{- end }}
 
+{{/*
+ConfigMap name of addon resizer
+*/}}
+{{- define "metrics-server.addonResizer.configMap" -}}
+{{- printf "%s-%s" (include "metrics-server.fullname" .) "nanny-config" }}
+{{- end }}
+
+{{/*
+Role name of addon resizer
+*/}}
+{{- define "metrics-server.addonResizer.role" -}}
+{{ printf "system:%s-nanny" (include "metrics-server.fullname" .) }}
+{{- end }}
+
 {{/* Get PodDisruptionBudget API Version */}}
 {{- define "metrics-server.pdb.apiVersion" -}}
   {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}}

diff --git a/charts/metrics-server/templates/configmaps-nanny.yaml b/charts/metrics-server/templates/configmaps-nanny.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "metrics-server.fullname" .}}-nanny-config
+  name: {{ include "metrics-server.addonResizer.configMap" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}

diff --git a/charts/metrics-server/templates/deployment.yaml b/charts/metrics-server/templates/deployment.yaml
@@ -121,6 +121,11 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
+      {{- if .Values.addonResizer.enabled }}
+        - name: nanny-config-volume
+          configMap:
+            name: {{ include "metrics-server.addonResizer.configMap" . }}
+      {{- end }}
       {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/metrics-server/templates/role-nanny.yaml b/charts/metrics-server/templates/role-nanny.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ printf "system:%s-nanny" (include "metrics-server.fullname" .) }}
+  name: {{ include "metrics-server.addonResizer.role" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
@@ -19,7 +19,7 @@ rules:
   resources:
   - deployments
   resourceNames:
-  - metrics-server
+  - {{ include "metrics-server.fullname" . }}
   verbs:
   - get
   - patch

diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
@@ -10,7 +10,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: metrics-server-nanny
+  name: {{ include "metrics-server.addonResizer.role" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}

diff --git a/charts/metrics-server/templates/rolebinding.yaml b/charts/metrics-server/templates/rolebinding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ printf "%s-auth-reader" (include "metrics-server.fullname" .)  }}
-  namespace: {{ .Release.Namespace }}
+  namespace: kube-system
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 roleRef:

diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
@@ -56,10 +56,15 @@ securityContext:
   readOnlyRootFilesystem: true
   runAsNonRoot: true
   runAsUser: 1000
+  seccompProfile:
+    type: RuntimeDefault
+  capabilities:
+    drop:
+      - ALL
 
 priorityClassName: system-cluster-critical
 
-containerPort: 4443
+containerPort: 10250
 
 hostNetwork:
   # Specifies if metrics-server should be started in hostNetwork mode.