Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Commit

Permalink
fix: #31 ability to have one certificate per ingress
Browse files Browse the repository at this point in the history 
Signed-off-by: Youssef El Houti <youssef.elhouti@gmail.com>
  • Loading branch information
@yelhouti
yelhouti committed Apr 23, 2020
1 parent 0f8f16b commit e28a26c
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 13 deletions.
8 changes: 6 additions & 2 deletions jxboot-resources/templates/700-bucketrepo-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ spec:
tls:
- hosts:
- bucketrepo{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.bucketrepo.ingress.tls.secretName }}
secretName: "{{ .Values.bucketrepo.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
{{- end }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 5 additions & 1 deletion jxboot-resources/templates/700-chartmuseum-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ spec:
tls:
- hosts:
- chartmuseum{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values "jenkins-x-platform" "chartmuseum" "ingress" "tls" "secretName" }}
secretName: "{{ .Values "jenkins-x-platform" "chartmuseum" "ingress" "tls" "secretName" }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
Expand Down
8 changes: 6 additions & 2 deletions jxboot-resources/templates/700-deck-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ spec:
tls:
- hosts:
- deck{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.deck.ingress.tls.secretName }}
secretName: "{{ .Values.deck.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
{{- end }}
{{- end }}
{{- end }}
{{- end }}
8 changes: 6 additions & 2 deletions jxboot-resources/templates/700-docker-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ spec:
tls:
- hosts:
- docker-registry{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values "docker-registry" "ingress" "tls" "secretName" }}
secretName: "{{ .Values "docker-registry" "ingress" "tls" "secretName" }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
{{- end }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 5 additions & 1 deletion jxboot-resources/templates/700-hook-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ spec:
tls:
- hosts:
- hook{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.hook.ingress.tls.secretName }}
secretName: "{{ .Values.hook.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
Expand Down
6 changes: 5 additions & 1 deletion jxboot-resources/templates/700-jenkins-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ spec:
tls:
- hosts:
- jenkins{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.jenkins.ingress.tls.secretName }}
secretName: "{{ .Values.jenkins.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
Expand Down
8 changes: 6 additions & 2 deletions jxboot-resources/templates/700-nexus-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ spec:
tls:
- hosts:
- nexus{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.nexus.ingress.tls.secretName }}
secretName: "{{ .Values.nexus.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
{{- end }}
{{- end }}
{{- end }}
{{- end }}
8 changes: 6 additions & 2 deletions jxboot-resources/templates/700-tide-ing.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ spec:
tls:
- hosts:
- tide{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
{{- if eq .Values.certmanager.production "true" }}
{{- if .Values.tide.ingress.tls.secretName }}
secretName: "{{ .Values.tide.ingress.tls.secretName }}"
{{- else if .Values.cluster.ingress.tls.secretName }}
secretName: "{{ .Values.cluster.ingress.tls.secretName }}"
{{- else if eq .Values.certmanager.production "true" }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
{{- else }}
secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
{{- end }}
{{- end }}
{{- end }}
{{- end }}

0 comments on commit e28a26c

Please sign in to comment.