Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update metrics-server chart and images #432

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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" -}}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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:

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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 }}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,57 +1,39 @@
--- 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:
+ kubernetes.io/os: linux

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: ""
5 changes: 2 additions & 3 deletions packages/rke2-metrics-server/package.yaml
Original file line number Diff line number Diff line change
@@ -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
Loading