From 34ade83c441f17fe67e324a17b48a70da8370368 Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Wed, 26 Jul 2023 14:17:41 +0100 Subject: [PATCH] feat(chart): Added changes for v3.11.0 Signed-off-by: Steve Hipwell --- charts/metrics-server/Chart.yaml | 20 ++++++++--------- charts/metrics-server/README.md | 22 +++++++++---------- .../metrics-server/templates/deployment.yaml | 3 +-- charts/metrics-server/values.yaml | 16 +++++--------- 4 files changed, 27 insertions(+), 34 deletions(-) diff --git a/charts/metrics-server/Chart.yaml b/charts/metrics-server/Chart.yaml index 996f21301c..6ed3af294b 100644 --- a/charts/metrics-server/Chart.yaml +++ b/charts/metrics-server/Chart.yaml @@ -2,8 +2,8 @@ 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.10.0 -appVersion: 0.6.3 +version: 3.11.0 +appVersion: 0.6.4 keywords: - kubernetes - metrics-server @@ -21,11 +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 support for running under PodSecurity restricted." - - kind: fixed - description: "Fixed container port default not having been updated to 10250." + - kind: changed + description: "Updated the Metrics Server OCI image to v0.6.3." + - kind: changed + description: "Updated the addon resizer OCI image to v1.8.19." + - kind: changed + description: "Changed the default addon resizer container resources to undefined to match the metrics-server container behaviour." + - kind: changed + description: "Changed the default addon resizer nanny resource configuration to match the documented Metrics Server values." diff --git a/charts/metrics-server/README.md b/charts/metrics-server/README.md index 187fbb3636..70c5a29950 100644 --- a/charts/metrics-server/README.md +++ b/charts/metrics-server/README.md @@ -59,17 +59,17 @@ The following table lists the configurable parameters of the _Metrics Server_ ch | `service.port` | Service port. | `443` | | `service.annotations` | Annotations to add to the service. | `{}` | | `service.labels` | Labels to add to the service. | `{}` | -| `addonResizer.enabled` | If `true`, run the addon-resizer as a sidecar to automatically scale resource requests with cluster size. | `false` | -| `addonResizer.image.repository` | addon-resizer image repository | registry.k8s.io/autoscaling/addon-resizer | -| `addonResizer.image.tag` | addon-resizer image tag | 1.8.14 | -| `addonResizer.resources` | Resource requests and limits for the _nanny_ container. | `{limits: {cpu: 40m, memory: 25Mi}, requests: {cpu: 40m, memory: 25Mi}}` | -| `addonResizer.nanny.cpu` | The base CPU requirement. | 20m | -| `addonResizer.nanny.extraCPU` | The amount of CPU to add per node. | 1m | -| `addonResizer.nanny.extraMemory` | The amount of memory to add per node. | 2Mi | -| `addonResizer.nanny.memory` | The base memory requirement. | 15Mi | -| `addonResizer.nanny.minClusterSize` | Specifies the smallest number of nodes resources will be scaled to. | 10 | -| `addonResizer.nanny.pollPeriod` | The time, in milliseconds, to poll the dependent container. | 300000 | -| `addonResizer.nanny.threshold` | A number between 0-100. The dependent's resources are rewritten when they deviate from expected by more than threshold. | 5 | +| `addonResizer.enabled` | If `true`, run the addon-resizer as a sidecar to automatically scale resource requests with cluster size. | `false` | +| `addonResizer.image.repository` | addon-resizer image repository | `registry.k8s.io/autoscaling/addon-resizer` | +| `addonResizer.image.tag` | addon-resizer image tag | `1.8.19` | +| `addonResizer.resources` | Resource requests and limits for the _nanny_ container. | `{}` | +| `addonResizer.nanny.cpu` | The base CPU requirement. | `100m` | +| `addonResizer.nanny.extraCPU` | The amount of CPU to add per node. | `1m` | +| `addonResizer.nanny.memory` | The base memory requirement. | `200Mi` | +| `addonResizer.nanny.extraMemory` | The amount of memory to add per node. | `2Mi` | +| `addonResizer.nanny.minClusterSize` | Specifies the smallest number of nodes resources will be scaled to. | `100` | +| `addonResizer.nanny.pollPeriod` | The time, in milliseconds, to poll the dependent container. | `300000` | +| `addonResizer.nanny.threshold` | A number between 0-100. The dependent's resources are rewritten when they deviate from expected by more than threshold. | `5` | | `metrics.enabled` | If `true`, allow unauthenticated access to `/metrics`. | `false` | | `serviceMonitor.enabled` | If `true`, create a _Prometheus_ service monitor. This needs `metrics.enabled` to be `true`. | `false` | | `serviceMonitor.additionalLabels` | Additional labels to be set on the ServiceMonitor. | `{}` | diff --git a/charts/metrics-server/templates/deployment.yaml b/charts/metrics-server/templates/deployment.yaml index 9f44be441d..1d656fccdd 100644 --- a/charts/metrics-server/templates/deployment.yaml +++ b/charts/metrics-server/templates/deployment.yaml @@ -103,9 +103,8 @@ spec: - /pod_nanny - --config-dir=/etc/config - --deployment={{ include "metrics-server.fullname" . }} - - --threshold={{ .Values.addonResizer.nanny.threshold }} - - --deployment={{ include "metrics-server.fullname" . }} - --container=metrics-server + - --threshold={{ .Values.addonResizer.nanny.threshold }} - --poll-period={{ .Values.addonResizer.nanny.pollPeriod }} - --estimator=exponential - --minClusterSize={{ .Values.addonResizer.nanny.minClusterSize }} diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml index 7520a947bc..cd620fbf0a 100644 --- a/charts/metrics-server/values.yaml +++ b/charts/metrics-server/values.yaml @@ -127,20 +127,14 @@ addonResizer: enabled: false image: repository: registry.k8s.io/autoscaling/addon-resizer - tag: 1.8.14 - resources: - limits: - cpu: 40m - memory: 25Mi - requests: - cpu: 40m - memory: 25Mi + tag: 1.8.19 + resources: {} nanny: - cpu: 20m + cpu: 0m extraCpu: 1m + memory: 0Mi extraMemory: 2Mi - memory: 15Mi - minClusterSize: 10 + minClusterSize: 100 pollPeriod: 300000 threshold: 5