Update metrics-server chart to show up in kubectl cluster-info (#12608)

Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> fixed formatting Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> forgot to sign off. Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> bump version and append values table in README.md Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> Update stable/metrics-server/README.md Co-Authored-By: Tariq Ibrahim <tariq181290@gmail.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> Update stable/metrics-server/values.yaml Co-Authored-By: Tariq Ibrahim <tariq181290@gmail.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> implementing feedback for metrics-server chart. Bumped chart version, updated metric-server-service template with server.labels value Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> adding new line at EOF for values in metrics-server chart to pass lint Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> can't win with these autoformatted spaces at the end of my values file... Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> [stable/metrics-server] Fix readme typo Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> Update metrics-server chart to show up in kubectl cluster-info Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> fixed formatting Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> forgot to sign off. Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> bump version and append values table in README.md Signed-off-by: ryanhartje <ryan.hartje@microsoft.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> Update stable/metrics-server/README.md Co-Authored-By: Tariq Ibrahim <tariq181290@gmail.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> Update stable/metrics-server/values.yaml Co-Authored-By: Tariq Ibrahim <tariq181290@gmail.com> Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> implementing feedback for metrics-server chart. Bumped chart version, updated metric-server-service template with server.labels value Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> adding new line at EOF for values in metrics-server chart to pass lint Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> can't win with these autoformatted spaces at the end of my values file... Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> [stable/metrics-server] Fix readme typo Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> [stable/metrics-server] updating service variable formatting to be consistent Signed-off-by: Ryan Hartje <ryan@ryanhartje.com> [stable/metrics-server] oof, mismatch for vars between values.yaml and the templates Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> [stable/metrics-server] reverting service values to camelCase as they should be Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com> [stable/metrics-server] updating template format Signed-off-by: Ryan Hartje <ryan.hartje@microsoft.com>
helm · May 20, 2019 · efa091f · efa091f
1 parent 53b0dda
commit efa091f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.3.2
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 2.7.1
+version: 2.8.0
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server

diff --git a/stable/metrics-server/README.md b/stable/metrics-server/README.md
@@ -29,6 +29,7 @@ Parameter | Description | Default
 `priorityClassName` | Pod priority class | `""`
 `readinessProbe` | Container readiness probe | See values.yaml
 `service.annotations` | Annotations to add to the service | `{}`
+`service.labels` | Labels to be added to the metrics-server service | `{}`
 `service.port` | Service port to expose | `443`
 `service.type` | Type of service to create | `ClusterIP`
 `podDisruptionBudget.enabled` | Create a PodDisruptionBudget | `false`

diff --git a/stable/metrics-server/templates/metric-server-service.yaml b/stable/metrics-server/templates/metric-server-service.yaml
@@ -7,6 +7,9 @@ metadata:
     chart: {{ template "metrics-server.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- with .Values.service.labels }}
+    {{ toYaml . | indent 4}}
+    {{- end }}
   annotations:
     {{- toYaml .Values.service.annotations | nindent 4 }}
 spec:

diff --git a/stable/metrics-server/values.yaml b/stable/metrics-server/values.yaml
@@ -49,9 +49,10 @@ affinity: {}
 replicas: 1
 
 podAnnotations: {}
+#  The following annotations guarantee scheduling for critical add-on pods.
+#    See more at: https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
 #  scheduler.alpha.kubernetes.io/critical-pod: ''
-
-# priorityClassName: system-node-critical
+#  priorityClassName: system-node-critical
 
 extraVolumeMounts: []
 #  - name: secrets
@@ -88,6 +89,10 @@ securityContext:
 
 service:
   annotations: {}
+  labels: {}
+  #  Add these labels to have metrics-server show up in `kubectl cluster-info`
+  #  kubernetes.io/cluster-service: "true"
+  #  kubernetes.io/name: metrics-server
   port: 443
   type: ClusterIP