From 5dcda5dcd62a36ca3c64133663c34ca8ff008e45 Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci <36044817+PierluigiLenociAkelius@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:27:56 +0200 Subject: [PATCH] [stable/metrics-server] Whitespace formatting, remove trailing blank lines (#16685) * bump metrics-server version Signed-off-by: Pierluigi Lenoci * Whitespace formatting, remove trailing blank lines Signed-off-by: Pierluigi Lenoci * Bump version back Signed-off-by: Pierluigi Lenoci --- stable/metrics-server/Chart.yaml | 2 +- .../templates/metric-server-service.yaml | 2 +- .../templates/metrics-api-service.yaml | 2 +- .../templates/metrics-server-deployment.yaml | 14 +++++++------- stable/metrics-server/templates/role-binding.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml index 518ec84391..f6c6eca5dc 100755 --- 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.8.3 +version: 2.8.4 keywords: - metrics-server home: https://github.com/kubernetes-incubator/metrics-server diff --git a/stable/metrics-server/templates/metric-server-service.yaml b/stable/metrics-server/templates/metric-server-service.yaml index bf149f9a9a..222bc78587 100644 --- a/stable/metrics-server/templates/metric-server-service.yaml +++ b/stable/metrics-server/templates/metric-server-service.yaml @@ -11,7 +11,7 @@ metadata: {{ toYaml . | nindent 4 }} {{- end }} annotations: - {{- toYaml .Values.service.annotations | nindent 4 }} + {{- toYaml .Values.service.annotations | trim | nindent 4 }} spec: ports: - port: {{ .Values.service.port }} diff --git a/stable/metrics-server/templates/metrics-api-service.yaml b/stable/metrics-server/templates/metrics-api-service.yaml index 88e0065cb0..552ffea38e 100644 --- a/stable/metrics-server/templates/metrics-api-service.yaml +++ b/stable/metrics-server/templates/metrics-api-service.yaml @@ -17,4 +17,4 @@ spec: insecureSkipTLSVerify: true groupPriorityMinimum: 100 versionPriority: 100 -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml index 725578c901..7e29e7a236 100644 --- a/stable/metrics-server/templates/metrics-server-deployment.yaml +++ b/stable/metrics-server/templates/metrics-server-deployment.yaml @@ -54,13 +54,13 @@ spec: - containerPort: 8443 name: https livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} + {{- toYaml .Values.livenessProbe | trim | nindent 12 }} readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} + {{- toYaml .Values.readinessProbe | trim | nindent 12 }} resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.resources | trim | nindent 12 }} securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} + {{- toYaml .Values.securityContext | trim | nindent 12 }} volumeMounts: - name: tmp mountPath: /tmp @@ -68,11 +68,11 @@ spec: {{- toYaml . | nindent 10 }} {{- end }} nodeSelector: - {{- toYaml .Values.nodeSelector | nindent 8 }} + {{- toYaml .Values.nodeSelector | trim | nindent 8 }} affinity: - {{- toYaml .Values.affinity | nindent 8 }} + {{- toYaml .Values.affinity | trim | nindent 8 }} tolerations: - {{- toYaml .Values.tolerations | nindent 8 }} + {{- toYaml .Values.tolerations | trim | nindent 8 }} volumes: - name: tmp emptyDir: {} diff --git a/stable/metrics-server/templates/role-binding.yaml b/stable/metrics-server/templates/role-binding.yaml index 94ca5319a9..81a8265fa9 100644 --- a/stable/metrics-server/templates/role-binding.yaml +++ b/stable/metrics-server/templates/role-binding.yaml @@ -17,4 +17,4 @@ subjects: - kind: ServiceAccount name: {{ template "metrics-server.serviceAccountName" . }} namespace: {{ .Release.Namespace }} -{{- end -}} \ No newline at end of file +{{- end -}}