From 422b57bbba7637f18f2fd57f516290b6fdb59220 Mon Sep 17 00:00:00 2001 From: Oladapo Fadeyi Date: Thu, 22 Aug 2019 12:44:06 +0100 Subject: [PATCH] fix yaml formatting issues --- .../test-vertx-web/templates/deployment.yaml | 98 +++++++++---------- charts/test-vertx-web/templates/ksvc.yaml | 70 ++++++------- charts/test-vertx-web/templates/role.yaml | 22 ++--- .../test-vertx-web/templates/rolebinding.yaml | 16 +-- charts/test-vertx-web/templates/service.yaml | 42 ++++---- .../templates/serviceaccount.yaml | 12 +-- 6 files changed, 130 insertions(+), 130 deletions(-) diff --git a/charts/test-vertx-web/templates/deployment.yaml b/charts/test-vertx-web/templates/deployment.yaml index 79b8316..f5976df 100755 --- a/charts/test-vertx-web/templates/deployment.yaml +++ b/charts/test-vertx-web/templates/deployment.yaml @@ -1,54 +1,54 @@ {{- if .Values.knativeDeploy }} - {{- else }} +{{- else }} apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} - labels: - draft: {{ default "draft-app" .Values.draft }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + name: {{ template "fullname" . }} + labels: + draft: {{ default "draft-app" .Values.draft }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" spec: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - draft: {{ default "draft-app" .Values.draft }} - app: {{ template "fullname" . }} - {{- if .Values.podAnnotations }} - annotations: - {{ toYaml .Values.podAnnotations | indent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Chart.Name }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: KUBERNETES_NAMESPACE - value: {{ .Release.Namespace | quote }} - {{- range $pkey, $pval := .Values.env }} - - name: {{ $pkey }} - value: {{ quote $pval }} - {{- end }} - ports: - - containerPort: {{ .Values.service.internalPort }} - livenessProbe: - httpGet: - path: {{ .Values.probePath }} - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - readinessProbe: - httpGet: - path: {{ .Values.probePath }} - port: {{ .Values.service.internalPort }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - resources: - {{ toYaml .Values.resources | indent 12 }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} - {{- end }} + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + draft: {{ default "draft-app" .Values.draft }} + app: {{ template "fullname" . }} +{{- if .Values.podAnnotations }} + annotations: +{{ toYaml .Values.podAnnotations | indent 8 }} +{{- end }} + spec: + serviceAccountName: {{ .Chart.Name }} + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: KUBERNETES_NAMESPACE + value: {{ .Release.Namespace | quote }} +{{- range $pkey, $pval := .Values.env }} + - name: {{ $pkey }} + value: {{ quote $pval }} +{{- end }} + ports: + - containerPort: {{ .Values.service.internalPort }} + livenessProbe: + httpGet: + path: {{ .Values.probePath }} + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + readinessProbe: + httpGet: + path: {{ .Values.probePath }} + port: {{ .Values.service.internalPort }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + resources: +{{ toYaml .Values.resources | indent 12 }} + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} +{{- end }} diff --git a/charts/test-vertx-web/templates/ksvc.yaml b/charts/test-vertx-web/templates/ksvc.yaml index 9b7b627..b49200b 100755 --- a/charts/test-vertx-web/templates/ksvc.yaml +++ b/charts/test-vertx-web/templates/ksvc.yaml @@ -2,39 +2,39 @@ apiVersion: serving.knative.dev/v1alpha1 kind: Service metadata: - {{- if .Values.service.name }} - name: {{ .Values.service.name }} - {{- else }} - name: {{ template "fullname" . }} - {{- end }} - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +{{- if .Values.service.name }} + name: {{ .Values.service.name }} +{{- else }} + name: {{ template "fullname" . }} +{{- end }} + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" spec: - runLatest: - configuration: - revisionTemplate: - spec: - container: - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - {{- range $pkey, $pval := .Values.env }} - - name: {{ $pkey }} - value: {{ quote $pval }} - {{- end }} - livenessProbe: - httpGet: - path: {{ .Values.probePath }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - readinessProbe: - httpGet: - path: {{ .Values.probePath }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - resources: - {{ toYaml .Values.resources | indent 14 }} - {{- end }} + runLatest: + configuration: + revisionTemplate: + spec: + container: + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: +{{- range $pkey, $pval := .Values.env }} + - name: {{ $pkey }} + value: {{ quote $pval }} +{{- end }} + livenessProbe: + httpGet: + path: {{ .Values.probePath }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + readinessProbe: + httpGet: + path: {{ .Values.probePath }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + resources: +{{ toYaml .Values.resources | indent 14 }} +{{- end }} diff --git a/charts/test-vertx-web/templates/role.yaml b/charts/test-vertx-web/templates/role.yaml index f4756f3..8ca38ee 100644 --- a/charts/test-vertx-web/templates/role.yaml +++ b/charts/test-vertx-web/templates/role.yaml @@ -1,15 +1,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ .Chart.Name }} + name: {{ .Chart.Name }} rules: - - apiGroups: - - "" - resources: - - endpoints - - pods - - services - verbs: - - get - - list - - watch +- apiGroups: + - "" + resources: + - endpoints + - pods + - services + verbs: + - get + - list + - watch diff --git a/charts/test-vertx-web/templates/rolebinding.yaml b/charts/test-vertx-web/templates/rolebinding.yaml index dcf8b75..9f38fd6 100644 --- a/charts/test-vertx-web/templates/rolebinding.yaml +++ b/charts/test-vertx-web/templates/rolebinding.yaml @@ -1,13 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ .Chart.Name }} - namespace: {{ .Release.Namespace }} + name: {{ .Chart.Name }} + namespace: {{ .Release.Namespace }} roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: {{ .Chart.Name }} + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ .Chart.Name }} subjects: - - kind: ServiceAccount - name: {{ .Chart.Name }} - namespace: {{ .Release.Namespace }} +- kind: ServiceAccount + name: {{ .Chart.Name }} + namespace: {{ .Release.Namespace }} diff --git a/charts/test-vertx-web/templates/service.yaml b/charts/test-vertx-web/templates/service.yaml index a8f4687..9321361 100755 --- a/charts/test-vertx-web/templates/service.yaml +++ b/charts/test-vertx-web/templates/service.yaml @@ -1,26 +1,26 @@ {{- if .Values.knativeDeploy }} - {{- else }} +{{- else }} apiVersion: v1 kind: Service metadata: - {{- if .Values.service.name }} - name: {{ .Values.service.name }} - {{- else }} - name: {{ template "fullname" . }} - {{- end }} - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" - {{- if .Values.service.annotations }} - annotations: - {{ toYaml .Values.service.annotations | indent 4 }} - {{- end }} +{{- if .Values.service.name }} + name: {{ .Values.service.name }} +{{- else }} + name: {{ template "fullname" . }} +{{- end }} + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +{{- if .Values.service.annotations }} + annotations: +{{ toYaml .Values.service.annotations | indent 4 }} +{{- end }} spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - protocol: TCP - name: http - selector: - app: {{ template "fullname" . }} - {{- end }} + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} + protocol: TCP + name: http + selector: + app: {{ template "fullname" . }} +{{- end }} diff --git a/charts/test-vertx-web/templates/serviceaccount.yaml b/charts/test-vertx-web/templates/serviceaccount.yaml index 5a60486..844adda 100644 --- a/charts/test-vertx-web/templates/serviceaccount.yaml +++ b/charts/test-vertx-web/templates/serviceaccount.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - labels: - app: {{ .Chart.Name }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - name: {{ .Chart.Name }} + labels: + app: {{ .Chart.Name }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + name: {{ .Chart.Name }}