-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Use consistent code style across templates (#4)
- Loading branch information
1 parent
1c182ef
commit d8508cd
Showing
19 changed files
with
255 additions
and
295 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,41 @@ | ||
| {{- if (and .Values.captivePortalService.ingress.enabled (not .Values.unifiedService.enabled)) }} | ||
| {{- $fullName := include "unifi.fullname" . -}} | ||
| {{- $ingressPath := .Values.captivePortalService.ingress.path -}} | ||
| {{- $unifiedServiceEnabled := .Values.unifiedService.enabled -}} | ||
| {{- $captivePortalHttps := .Values.captivePortalService.https -}} | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ $fullName }}-captive | ||
| labels: | ||
| app.kubernetes.io/name: {{ include "unifi.name" . }} | ||
| helm.sh/chart: {{ include "unifi.chart" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| {{- with .Values.captivePortalService.ingress.annotations }} | ||
| {{- with .Values.captivePortalService.ingress.annotations }} | ||
| annotations: | ||
| {{ toYaml . | indent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- if .Values.captivePortalService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.captivePortalService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "unifi.labels" . | nindent 4 }} | ||
| spec: | ||
| rules: | ||
| {{- range .Values.captivePortalService.ingress.hosts }} | ||
| - host: {{ . }} | ||
| http: | ||
| paths: | ||
| - path: {{ $ingressPath }} | ||
| - path: {{ $.Values.captivePortalService.ingress.path }} | ||
| pathType: Prefix | ||
| backend: | ||
| service: | ||
| name: {{ $fullName }}-captiveportalservice | ||
| port: | ||
| {{- if $captivePortalHttps }} | ||
| {{- if $.Values.captivePortalService.https }} | ||
| name: captive-https | ||
| {{- else }} | ||
| name: captive-http | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if .Values.captivePortalService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.captivePortalService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,37 @@ | ||
| {{- if (and .Values.controllerService.ingress.enabled (not .Values.unifiedService.enabled)) }} | ||
| {{- $fullName := include "unifi.fullname" . -}} | ||
| {{- $ingressPath := .Values.controllerService.ingress.path -}} | ||
| {{- $unifiedServiceEnabled := .Values.unifiedService.enabled -}} | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ $fullName }}-controller | ||
| labels: | ||
| app.kubernetes.io/name: {{ include "unifi.name" . }} | ||
| helm.sh/chart: {{ include "unifi.chart" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| {{- with .Values.controllerService.ingress.annotations }} | ||
| {{- with .Values.controllerService.ingress.annotations }} | ||
| annotations: | ||
| {{ toYaml . | indent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- if .Values.controllerService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.controllerService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "unifi.labels" . | nindent 4 }} | ||
| spec: | ||
| rules: | ||
| {{- range .Values.controllerService.ingress.hosts }} | ||
| {{- range .Values.controllerService.ingress.hosts }} | ||
| - host: {{ . }} | ||
| http: | ||
| paths: | ||
| - path: {{ $ingressPath }} | ||
| - path: {{ $.Values.controllerService.ingress.path }} | ||
| pathType: Prefix | ||
| backend: | ||
| service: | ||
| name: {{ $fullName }}-controller | ||
| port: | ||
| name: controller | ||
| {{- end }} | ||
| {{- if .Values.controllerService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.controllerService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.