From f11447d127d21dd56b302fe1014f4801d32511c5 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 26 Mar 2020 14:20:56 +0100 Subject: Fix spacing issues in YAML files in vnfs Fixes applied as reported by yamllint. Change-Id: I8bd30d49e728715fdc696bb984fbca842ac1c2b8 Issue-ID: INT-1482 Signed-off-by: Bartek Grzybowski --- vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml | 2 +- .../deploy/collection/charts/cadvisor/templates/daemonset.yaml | 2 +- vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml | 4 ++-- .../charts/prometheus-node-exporter/templates/daemonset.yaml | 2 +- .../charts/prometheus-node-exporter/templates/endpoints.yaml | 2 +- .../charts/prometheus-node-exporter/templates/psp-clusterrole.yaml | 2 +- .../charts/prometheus-node-exporter/templates/serviceaccount.yaml | 6 +++--- vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml | 2 +- .../deploy/collection/charts/prometheus/templates/rolebinding.yaml | 2 +- vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml | 2 +- vnfs/DAaaS/deploy/collection/values.yaml | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'vnfs/DAaaS/deploy/collection') diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml index aea55a29..ddfe629a 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml @@ -14,6 +14,6 @@ apiVersion: v1 appVersion: "1.0" -description: Cadvisor Helm Chart +description: Cadvisor Helm Chart name: cadvisor version: 0.1.0 diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml index e287c7d8..e33e5880 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml @@ -17,7 +17,7 @@ apiVersion: apps/v1beta2 kind: DaemonSet metadata: - name: {{ template "fullname" . }} + name: {{ template "fullname" . }} labels: app: {{ template "name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml index c52eb22d..daea41d5 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: - name: cadvisor + name: cadvisor labels: app: cadvisor release: {{ .Release.Name }} @@ -27,7 +27,7 @@ spec: selector: {{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }} ports: - - name: cadvisor-prometheus + - name: cadvisor-prometheus {{- if eq .Values.cadvisor_prometheus.service.type "NodePort" }} nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }} {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml index dfb15f1d..6ca20b6f 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml @@ -95,4 +95,4 @@ spec: hostPath: path: {{ $mount.hostPath }} {{- end }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml index 4c5c75fa..226dd486 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml @@ -14,4 +14,4 @@ subsets: - name: metrics port: 9100 protocol: TCP -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml index 3d0a636a..b833c246 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml @@ -8,7 +8,7 @@ metadata: rules: - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] - verbs: ['use'] + verbs: ['use'] resourceNames: - {{ template "prometheus-node-exporter.fullname" . }} {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml index b70745aa..419451b8 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml @@ -6,10 +6,10 @@ metadata: name: {{ template "prometheus-node-exporter.serviceAccountName" . }} labels: app: {{ template "prometheus-node-exporter.name" . }} - chart: {{ template "prometheus-node-exporter.chart" . }} + chart: {{ template "prometheus-node-exporter.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" -imagePullSecrets: +imagePullSecrets: {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml index dfb932d8..4fa053e7 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml @@ -18,4 +18,4 @@ rules: verbs: - get - list - - watch \ No newline at end of file + - watch diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml index 04932ee1..b30c6cf7 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml @@ -14,4 +14,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "prometheus.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} \ No newline at end of file + namespace: {{ .Release.Namespace }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml index e35c6735..a9f675da 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml @@ -37,7 +37,7 @@ prometheus: - port: cadvisor-prometheus interval: 10s path: /metrics - + resources: {} service: type: ClusterIP diff --git a/vnfs/DAaaS/deploy/collection/values.yaml b/vnfs/DAaaS/deploy/collection/values.yaml index d46f3861..96cce139 100644 --- a/vnfs/DAaaS/deploy/collection/values.yaml +++ b/vnfs/DAaaS/deploy/collection/values.yaml @@ -31,9 +31,9 @@ global: # Enable or disable components ################################################################# -cadvisor: +cadvisor: enabled: true - + collectd: enabled: true -- cgit 1.2.3-korg