From 16ab22f24cdb7437b01ee63aaf72f1e8e5338b8b Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Sat, 26 Apr 2025 11:05:28 +0200 Subject: [PATCH] chore: update metrics-server --- .../metrics-server/templates/apiservice.yaml | 4 ++-- .../clusterrole-aggregated-reader.yaml | 4 ++-- .../metrics-server/templates/clusterrole.yaml | 4 ++-- .../clusterrolebinding-auth-delegator.yaml | 4 ++-- .../templates/clusterrolebinding.yaml | 4 ++-- .../metrics-server/templates/deployment.yaml | 20 +++++++++++++------ .../metrics-server/templates/rolebinding.yaml | 6 +++--- .../metrics-server/templates/service.yaml | 5 +++-- .../templates/serviceaccount.yaml | 4 ++-- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/deploy/base/inflated/metrics-server/templates/apiservice.yaml b/deploy/base/inflated/metrics-server/templates/apiservice.yaml index 1ce0a09..3059421 100644 --- a/deploy/base/inflated/metrics-server/templates/apiservice.yaml +++ b/deploy/base/inflated/metrics-server/templates/apiservice.yaml @@ -5,10 +5,10 @@ kind: APIService metadata: name: v1beta1.metrics.k8s.io labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm spec: group: metrics.k8s.io diff --git a/deploy/base/inflated/metrics-server/templates/clusterrole-aggregated-reader.yaml b/deploy/base/inflated/metrics-server/templates/clusterrole-aggregated-reader.yaml index 74f397a..161e158 100644 --- a/deploy/base/inflated/metrics-server/templates/clusterrole-aggregated-reader.yaml +++ b/deploy/base/inflated/metrics-server/templates/clusterrole-aggregated-reader.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: system:metrics-server-aggregated-reader labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" diff --git a/deploy/base/inflated/metrics-server/templates/clusterrole.yaml b/deploy/base/inflated/metrics-server/templates/clusterrole.yaml index de7a2cb..33275cc 100644 --- a/deploy/base/inflated/metrics-server/templates/clusterrole.yaml +++ b/deploy/base/inflated/metrics-server/templates/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: system:metrics-server labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm rules: - apiGroups: diff --git a/deploy/base/inflated/metrics-server/templates/clusterrolebinding-auth-delegator.yaml b/deploy/base/inflated/metrics-server/templates/clusterrolebinding-auth-delegator.yaml index da08b65..6728b77 100644 --- a/deploy/base/inflated/metrics-server/templates/clusterrolebinding-auth-delegator.yaml +++ b/deploy/base/inflated/metrics-server/templates/clusterrolebinding-auth-delegator.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: metrics-server:system:auth-delegator labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/deploy/base/inflated/metrics-server/templates/clusterrolebinding.yaml b/deploy/base/inflated/metrics-server/templates/clusterrolebinding.yaml index 0c50a4f..77bb1c6 100644 --- a/deploy/base/inflated/metrics-server/templates/clusterrolebinding.yaml +++ b/deploy/base/inflated/metrics-server/templates/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: system:metrics-server labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/deploy/base/inflated/metrics-server/templates/deployment.yaml b/deploy/base/inflated/metrics-server/templates/deployment.yaml index 9785e78..1208caf 100644 --- a/deploy/base/inflated/metrics-server/templates/deployment.yaml +++ b/deploy/base/inflated/metrics-server/templates/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: metrics-server namespace: default labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,20 +23,24 @@ spec: app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server spec: - schedulerName: serviceAccountName: metrics-server priorityClassName: "system-cluster-critical" containers: - name: metrics-server securityContext: allowPrivilegeEscalation: false + capabilities: + drop: + - ALL readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: k8s.gcr.io/metrics-server/metrics-server:v0.6.2 + seccompProfile: + type: RuntimeDefault + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent args: - - --secure-port=4443 + - --secure-port=10250 - --cert-dir=/tmp - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --kubelet-use-node-status-port @@ -44,7 +48,7 @@ spec: ports: - name: https protocol: TCP - containerPort: 4443 + containerPort: 10250 livenessProbe: failureThreshold: 3 httpGet: @@ -64,6 +68,10 @@ spec: volumeMounts: - name: tmp mountPath: /tmp + resources: + requests: + cpu: 100m + memory: 200Mi volumes: - name: tmp emptyDir: {} diff --git a/deploy/base/inflated/metrics-server/templates/rolebinding.yaml b/deploy/base/inflated/metrics-server/templates/rolebinding.yaml index a2a08dc..de374cb 100644 --- a/deploy/base/inflated/metrics-server/templates/rolebinding.yaml +++ b/deploy/base/inflated/metrics-server/templates/rolebinding.yaml @@ -4,12 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: metrics-server-auth-reader - namespace: default + namespace: kube-system labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/deploy/base/inflated/metrics-server/templates/service.yaml b/deploy/base/inflated/metrics-server/templates/service.yaml index 8238516..d9aae6d 100644 --- a/deploy/base/inflated/metrics-server/templates/service.yaml +++ b/deploy/base/inflated/metrics-server/templates/service.yaml @@ -6,10 +6,10 @@ metadata: name: metrics-server namespace: default labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -18,6 +18,7 @@ spec: port: 443 protocol: TCP targetPort: https + appProtocol: https selector: app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server diff --git a/deploy/base/inflated/metrics-server/templates/serviceaccount.yaml b/deploy/base/inflated/metrics-server/templates/serviceaccount.yaml index 74466e7..3eaeef1 100644 --- a/deploy/base/inflated/metrics-server/templates/serviceaccount.yaml +++ b/deploy/base/inflated/metrics-server/templates/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: metrics-server namespace: default labels: - helm.sh/chart: metrics-server-3.8.3 + helm.sh/chart: metrics-server-3.12.2 app.kubernetes.io/name: metrics-server app.kubernetes.io/instance: metrics-server - app.kubernetes.io/version: "0.6.2" + app.kubernetes.io/version: "0.7.2" app.kubernetes.io/managed-by: Helm