From 90bb86c3663ff1d4b35ef5b30f2505f5974ed145 Mon Sep 17 00:00:00 2001 From: amecea Date: Sat, 6 Jul 2019 20:43:16 +0300 Subject: [PATCH] Fix chart indentation and spacing --- .../mysql-operator/templates/orc-ingress.yaml | 62 +++++++++---------- .../mysql-operator/templates/orc-service.yaml | 18 +++--- hack/charts/mysql-operator/values.yaml | 2 +- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/hack/charts/mysql-operator/templates/orc-ingress.yaml b/hack/charts/mysql-operator/templates/orc-ingress.yaml index 7db755092..980d7b463 100644 --- a/hack/charts/mysql-operator/templates/orc-ingress.yaml +++ b/hack/charts/mysql-operator/templates/orc-ingress.yaml @@ -1,36 +1,36 @@ {{- if .Values.orchestrator.ingress.enabled -}} - {{- $fullName := include "mysql-operator.fullname" . -}} +{{- $fullName := include "mysql-operator.fullname" . -}} apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: {{ $fullName }} - labels: - {{ include "mysql-operator.labels" . | indent 4 }} - {{- with .Values.orchestrator.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + name: {{ $fullName }} + labels: + {{ include "mysql-operator.labels" . | indent 4 }} + {{- with .Values.orchestrator.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: - {{- if .Values.orchestrator.ingress.tls }} - tls: - {{- range .Values.orchestrator.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.orchestrator.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} - {{- end }} - {{- end }} + {{- if .Values.orchestrator.ingress.tls }} + tls: + {{- range .Values.orchestrator.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.orchestrator.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ . }} + backend: + serviceName: {{ $fullName }} + servicePort: http + {{- end }} + {{- end }} +{{- end }} diff --git a/hack/charts/mysql-operator/templates/orc-service.yaml b/hack/charts/mysql-operator/templates/orc-service.yaml index 445853d7b..458a762b3 100644 --- a/hack/charts/mysql-operator/templates/orc-service.yaml +++ b/hack/charts/mysql-operator/templates/orc-service.yaml @@ -9,12 +9,12 @@ and for routing/proxying to the leader. apiVersion: v1 kind: Service metadata: - name: "{{$fullName}}-{{$i}}-svc" + name: {{ $fullName }}-{{ $i }}-svc labels: - app: "{{$fullName}}" - chart: {{$chart}} - release: "{{ $.Release.Name }}" - heritage: "{{ $.Release.Service }}" + app: {{ $fullName }} + chart: {{ $chart }} + release: {{ $.Release.Name }} + heritage: {{ $.Release.Service }} annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: @@ -27,14 +27,14 @@ spec: port: 10008 targetPort: 10008 selector: - statefulset.kubernetes.io/pod-name: {{$fullName}}-{{$i}} + statefulset.kubernetes.io/pod-name: {{ $fullName }}-{{ $i }} --- {{end}} {{/*{orchestrator will make sure that this service always talks to the leader}*/}} apiVersion: v1 kind: Service metadata: - name: "{{ template "mysql-operator.fullname" . }}" + name: {{ template "mysql-operator.fullname" . }} labels: app: {{ template "mysql-operator.name" . }} chart: {{ template "mysql-operator.chart" . }} @@ -49,6 +49,6 @@ spec: port: {{ .Values.orchestrator.service.port }} protocol: TCP targetPort: 3000 - {{- if .Values.orchestrator.service.nodePort }} + {{- if .Values.orchestrator.service.nodePort }} nodePort: {{ .Values.orchestrator.service.nodePort }} - {{- end }} + {{- end }} diff --git a/hack/charts/mysql-operator/values.yaml b/hack/charts/mysql-operator/values.yaml index 0146b2115..40065898b 100644 --- a/hack/charts/mysql-operator/values.yaml +++ b/hack/charts/mysql-operator/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicas: 3 +replicas: 1 image: quay.io/presslabs/mysql-operator:latest sidecarImage: quay.io/presslabs/mysql-operator-sidecar:latest imagePullPolicy: IfNotPresent