Skip to content

Commit

Permalink
Fix chart indentation and spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
AMecea committed Jul 8, 2019
1 parent accabe5 commit 90bb86c
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 41 deletions.
62 changes: 31 additions & 31 deletions hack/charts/mysql-operator/templates/orc-ingress.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
18 changes: 9 additions & 9 deletions hack/charts/mysql-operator/templates/orc-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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" . }}
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion hack/charts/mysql-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 90bb86c

Please sign in to comment.