From eec75217db66cd85691825b3bff30088de29663c Mon Sep 17 00:00:00 2001 From: George Baird Date: Mon, 19 Aug 2019 17:41:56 -0400 Subject: [PATCH 1/4] Add a way to specify additional arguments to metrics-server using declarative configuration --- bitnami/metrics-server/README.md | 1 + bitnami/metrics-server/templates/deployment.yaml | 3 +++ bitnami/metrics-server/values.yaml | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index 4eef1810f..88dfbc40a 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -58,6 +58,7 @@ The following tables lists the configurable parameters of the Metrics Server cha | `nameOverride` | String to partially override metrics-server.fullname template with a string (will prepend the release name) | `nil` | | `fullnameOverride` | String to fully override metrics-server.fullname template with a string | `nil` | | `securePort` | Port where metrics-server will be running | `8443` | +| `extraArgumentss` | Extra arguments to pass to metrics-server on start up | [] | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Kubernetes Service port | `443` | | `service.annotations` | Annotations for the Service | {} | diff --git a/bitnami/metrics-server/templates/deployment.yaml b/bitnami/metrics-server/templates/deployment.yaml index b591d0499..0bff54915 100644 --- a/bitnami/metrics-server/templates/deployment.yaml +++ b/bitnami/metrics-server/templates/deployment.yaml @@ -36,3 +36,6 @@ spec: command: - metrics-server - --secure-port={{ .Values.securePort }} +{{- if .Values.extraArguments }} +{{ toYaml .Values.extraArguments | indent 8 }} +{{- end }} diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml index 48cf7bcad..77c7397be 100644 --- a/bitnami/metrics-server/values.yaml +++ b/bitnami/metrics-server/values.yaml @@ -57,6 +57,10 @@ apiService: ## securePort: 8443 +## A list of extra arguments to pass to the metrics-server +## +extraArguments: [] + service: type: ClusterIP port: 443 From fc8de1620d5bc1800d50f0cadbe679552e1b256a Mon Sep 17 00:00:00 2001 From: George Baird Date: Tue, 20 Aug 2019 09:21:18 -0400 Subject: [PATCH 2/4] Bump chart version --- bitnami/metrics-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml index 22fad677f..39b655597 100644 --- a/bitnami/metrics-server/Chart.yaml +++ b/bitnami/metrics-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: metrics-server -version: 3.0.1 +version: 3.0.2 appVersion: 0.3.3 description: Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node. keywords: From 9ee123d8b57df471d1da2dbef61efda55740d27c Mon Sep 17 00:00:00 2001 From: George Baird Date: Tue, 20 Aug 2019 17:47:14 -0400 Subject: [PATCH 3/4] Requested changes from alemorcuq --- bitnami/metrics-server/Chart.yaml | 2 +- bitnami/metrics-server/README.md | 2 +- bitnami/metrics-server/templates/deployment.yaml | 6 +++--- bitnami/metrics-server/values.yaml | 8 ++++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml index 39b655597..ccbd3aa9d 100644 --- a/bitnami/metrics-server/Chart.yaml +++ b/bitnami/metrics-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: metrics-server -version: 3.0.2 +version: 3.1.0 appVersion: 0.3.3 description: Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node. keywords: diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index 88dfbc40a..be3768032 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -58,7 +58,7 @@ The following tables lists the configurable parameters of the Metrics Server cha | `nameOverride` | String to partially override metrics-server.fullname template with a string (will prepend the release name) | `nil` | | `fullnameOverride` | String to fully override metrics-server.fullname template with a string | `nil` | | `securePort` | Port where metrics-server will be running | `8443` | -| `extraArgumentss` | Extra arguments to pass to metrics-server on start up | [] | +| `extraArgs` | Extra arguments to pass to metrics-server on start up | [] | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Kubernetes Service port | `443` | | `service.annotations` | Annotations for the Service | {} | diff --git a/bitnami/metrics-server/templates/deployment.yaml b/bitnami/metrics-server/templates/deployment.yaml index 0bff54915..d45c29fd1 100644 --- a/bitnami/metrics-server/templates/deployment.yaml +++ b/bitnami/metrics-server/templates/deployment.yaml @@ -36,6 +36,6 @@ spec: command: - metrics-server - --secure-port={{ .Values.securePort }} -{{- if .Values.extraArguments }} -{{ toYaml .Values.extraArguments | indent 8 }} -{{- end }} + {{- range $key, $value := .Values.extraArgs }} + - --{{ $key }}={{ $value }} + {{- end }} diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml index 77c7397be..235bf3d45 100644 --- a/bitnami/metrics-server/values.yaml +++ b/bitnami/metrics-server/values.yaml @@ -57,9 +57,13 @@ apiService: ## securePort: 8443 -## A list of extra arguments to pass to the metrics-server +## Extra arguments to pass to the metrics-server ## -extraArguments: [] +extraArgs: {} + # To specify extra arguments, uncomment the following lines, adjust them as necessary, + # and remove the curly braces after 'extraArgs:'. + # kubelet-insecure-tls: true + # kubelet-preferred-address-types: InternalIP service: type: ClusterIP From ca22656e909a7526fbc38d311f2baf136d2c587b Mon Sep 17 00:00:00 2001 From: George Baird Date: Wed, 21 Aug 2019 09:59:20 -0400 Subject: [PATCH 4/4] Further requested changes from alemorcuq --- bitnami/metrics-server/README.md | 2 +- bitnami/metrics-server/values.yaml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index be3768032..53f3b335e 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -58,7 +58,7 @@ The following tables lists the configurable parameters of the Metrics Server cha | `nameOverride` | String to partially override metrics-server.fullname template with a string (will prepend the release name) | `nil` | | `fullnameOverride` | String to fully override metrics-server.fullname template with a string | `nil` | | `securePort` | Port where metrics-server will be running | `8443` | -| `extraArgs` | Extra arguments to pass to metrics-server on start up | [] | +| `extraArgs` | Extra arguments to pass to metrics-server on start up | {} | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Kubernetes Service port | `443` | | `service.annotations` | Annotations for the Service | {} | diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml index 235bf3d45..d77519237 100644 --- a/bitnami/metrics-server/values.yaml +++ b/bitnami/metrics-server/values.yaml @@ -58,12 +58,13 @@ apiService: securePort: 8443 ## Extra arguments to pass to the metrics-server +## ref: https://github.com/kubernetes-incubator/metrics-server/blob/master/README.md#flags +## +## extraArgs: +## kubelet-insecure-tls: true +## kubelet-preferred-address-types: InternalIP ## extraArgs: {} - # To specify extra arguments, uncomment the following lines, adjust them as necessary, - # and remove the curly braces after 'extraArgs:'. - # kubelet-insecure-tls: true - # kubelet-preferred-address-types: InternalIP service: type: ClusterIP