From 35287200b11b3a8699fa1dc0400134cbb46c2b83 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 1 Apr 2024 11:45:08 +0200 Subject: [PATCH] Update metrics-server chart and images Signed-off-by: Manuel Buil --- .../generated-changes/patch/Chart.yaml.patch | 29 +++++----- .../patch/templates/_helpers.tpl.patch | 6 +- .../patch/templates/cluster-role.yaml.patch | 30 ---------- .../patch/templates/deployment.yaml.patch | 11 ++++ .../metric-server-service.yaml.patch | 8 --- .../templates/metrics-api-service.yaml.patch | 9 --- .../metrics-server-deployment.yaml.patch | 26 --------- .../patch/templates/service.yaml.patch | 9 +++ .../templates/tests/test-version.yaml.patch | 11 ---- .../generated-changes/patch/values.yaml.patch | 56 +++++++------------ packages/rke2-metrics-server/package.yaml | 5 +- 11 files changed, 59 insertions(+), 141 deletions(-) delete mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/cluster-role.yaml.patch create mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/deployment.yaml.patch delete mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/metric-server-service.yaml.patch delete mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/metrics-api-service.yaml.patch delete mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/metrics-server-deployment.yaml.patch create mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/service.yaml.patch delete mode 100644 packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch diff --git a/packages/rke2-metrics-server/generated-changes/patch/Chart.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/Chart.yaml.patch index 7d4d42fd0..24e78a02f 100644 --- a/packages/rke2-metrics-server/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-metrics-server/generated-changes/patch/Chart.yaml.patch @@ -1,19 +1,20 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,5 +1,5 @@ - apiVersion: v1 --appVersion: 0.3.6 -+appVersion: 0.6.3 - description: Metrics Server is a cluster-wide aggregator of resource usage data. - home: https://github.com/kubernetes-incubator/metrics-server - keywords: -@@ -9,7 +9,7 @@ - name: olemarkus - - email: k.aasan@sportradar.com - name: kennethaasan +@@ -5,7 +5,7 @@ + - kind: changed + description: "Updated the _addon-resizer_ OCI image to [v1.8.20](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.20)." + apiVersion: v2 +-appVersion: 0.7.0 ++appVersion: 0.7.1 + description: Metrics Server is a scalable, efficient source of container resource + metrics for Kubernetes built-in autoscaling pipelines. + home: https://github.com/kubernetes-sigs/metrics-server +@@ -21,7 +21,7 @@ + url: https://github.com/krmichel + - name: endrec + url: https://github.com/endrec -name: metrics-server +name: rke2-metrics-server sources: - - https://github.com/kubernetes-incubator/metrics-server --version: 2.11.1 -+version: 2.11.100-build20230515 + - https://github.com/kubernetes-sigs/metrics-server + type: application diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/_helpers.tpl.patch index 6bb58c16a..122e82fbb 100644 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rke2-metrics-server/generated-changes/patch/templates/_helpers.tpl.patch @@ -1,8 +1,8 @@ --- charts-original/templates/_helpers.tpl +++ charts/templates/_helpers.tpl -@@ -49,3 +49,11 @@ - {{ default "default" .Values.serviceAccount.name }} - {{- end -}} +@@ -100,3 +100,11 @@ + {{- print "policy/v1beta1" -}} + {{- end -}} {{- end -}} + +{{- define "system_default_registry" -}} diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/cluster-role.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/cluster-role.yaml.patch deleted file mode 100644 index 313e76646..000000000 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/cluster-role.yaml.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/deployment.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/deployment.yaml.patch new file mode 100644 index 000000000..a29cf7034 --- /dev/null +++ b/packages/rke2-metrics-server/generated-changes/patch/templates/deployment.yaml.patch @@ -0,0 +1,11 @@ +--- charts-original/templates/deployment.yaml ++++ charts/templates/deployment.yaml +@@ -100,7 +100,7 @@ + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} +- image: {{ include "metrics-server.addonResizer.image" . }} ++ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }} + env: + - name: MY_POD_NAME + valueFrom: diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/metric-server-service.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/metric-server-service.yaml.patch deleted file mode 100644 index 659640e90..000000000 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/metric-server-service.yaml.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- charts-original/templates/metric-server-service.yaml -+++ charts/templates/metric-server-service.yaml -@@ -22,4 +22,5 @@ - app: {{ template "metrics-server.name" . }} - release: {{ .Release.Name }} - type: {{ .Values.service.type }} -+ ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} - diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-api-service.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-api-service.yaml.patch deleted file mode 100644 index 62f11a057..000000000 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-api-service.yaml.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- charts-original/templates/metrics-api-service.yaml -+++ charts/templates/metrics-api-service.yaml -@@ -1,5 +1,5 @@ - {{- if .Values.apiService.create -}} --apiVersion: apiregistration.k8s.io/v1beta1 -+apiVersion: apiregistration.k8s.io/v1 - kind: APIService - metadata: - name: v1beta1.metrics.k8s.io diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-server-deployment.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-server-deployment.yaml.patch deleted file mode 100644 index 145e7ff19..000000000 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/metrics-server-deployment.yaml.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- charts-original/templates/metrics-server-deployment.yaml -+++ charts/templates/metrics-server-deployment.yaml -@@ -47,18 +47,20 @@ - {{- ( tpl (toYaml .Values.extraContainers) . ) | nindent 8 }} - {{- end }} - - name: metrics-server -- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" -+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }} - 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 }} diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/service.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/service.yaml.patch new file mode 100644 index 000000000..9c32d7fe8 --- /dev/null +++ b/packages/rke2-metrics-server/generated-changes/patch/templates/service.yaml.patch @@ -0,0 +1,9 @@ +--- charts-original/templates/service.yaml ++++ charts/templates/service.yaml +@@ -19,5 +19,6 @@ + port: {{ .Values.service.port }} + protocol: TCP + targetPort: https ++ ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} + selector: + {{- include "metrics-server.selectorLabels" . | nindent 4 }} diff --git a/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch deleted file mode 100644 index de356b058..000000000 --- a/packages/rke2-metrics-server/generated-changes/patch/templates/tests/test-version.yaml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/templates/tests/test-version.yaml -+++ charts/templates/tests/test-version.yaml -@@ -12,7 +12,7 @@ - spec: - containers: - - name: wget -- image: busybox -+ image: {{ template "system_default_registry" . }}{{ .Values.tests.image.repository }}:{{ .Values.tests.image.tag }} - command: ['/bin/sh'] - args: - - -c diff --git a/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch b/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch index 4729d8dcc..c90ab6e1e 100644 --- a/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-metrics-server/generated-changes/patch/values.yaml.patch @@ -1,25 +1,28 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -27,20 +27,22 @@ - enabled: false +@@ -3,9 +3,9 @@ + # Declare variables to be passed into your templates. image: -- repository: k8s.gcr.io/metrics-server-amd64 -- tag: v0.3.6 +- repository: registry.k8s.io/metrics-server/metrics-server + repository: rancher/hardened-k8s-metrics-server -+ tag: v0.6.3-build20231009 + # Overrides the image tag whose default is v{{ .Chart.AppVersion }} +- tag: "" ++ tag: v0.7.1-build20240401 pullPolicy: IfNotPresent imagePullSecrets: [] - # - registrySecretName - --args: [] -+args: - # enable this if you have self-signed certificates, see: https://github.com/kubernetes-incubator/metrics-server - # - --kubelet-insecure-tls -+ - --kubelet-preferred-address-types=InternalIP +@@ -121,6 +121,7 @@ + port: 443 + annotations: {} + labels: {} ++ ipFamilyPolicy: "PreferDualStack" + # Add these labels to have metrics-server show up in `kubectl cluster-info` + # kubernetes.io/cluster-service: "true" + # kubernetes.io/name: "Metrics-server" +@@ -180,7 +181,8 @@ - resources: {} + extraVolumes: [] -nodeSelector: {} +nodeSelector: @@ -27,31 +30,10 @@ tolerations: [] -@@ -58,7 +60,7 @@ - # scheduler.alpha.kubernetes.io/critical-pod: '' - - ## Set a pod priorityClassName --# priorityClassName: system-node-critical -+priorityClassName: system-node-critical +@@ -197,3 +199,6 @@ - extraVolumeMounts: [] - # - name: secrets -@@ -101,9 +103,18 @@ - # kubernetes.io/name: "Metrics-server" - port: 443 - type: ClusterIP -+ ipFamilyPolicy: "PreferDualStack" - - podDisruptionBudget: - # https://kubernetes.io/docs/tasks/run-application/configure-pdb/ - enabled: false - minAvailable: - maxUnavailable: -+ -+tests: -+ image: -+ repository: rancher/mirrored-library-busybox -+ tag: "1.36.1" + tmpVolume: + emptyDir: {} + +global: + systemDefaultRegistry: "" diff --git a/packages/rke2-metrics-server/package.yaml b/packages/rke2-metrics-server/package.yaml index c97390d61..776cf625d 100644 --- a/packages/rke2-metrics-server/package.yaml +++ b/packages/rke2-metrics-server/package.yaml @@ -1,3 +1,2 @@ -url: https://charts.helm.sh/stable/packages/metrics-server-2.11.1.tgz -packageVersion: 13 -releaseCandidateVersion: 00 +url: https://github.com/kubernetes-sigs/metrics-server/releases/download/metrics-server-helm-chart-3.12.0/metrics-server-3.12.0.tgz +packageVersion: 00