From e28a26c1b3f7ff50a76eef596bde0f86e4e350f1 Mon Sep 17 00:00:00 2001 From: Youssef El Houti Date: Wed, 22 Apr 2020 00:37:06 +0200 Subject: [PATCH] fix: #31 ability to have one certificate per ingress Signed-off-by: Youssef El Houti --- jxboot-resources/templates/700-bucketrepo-ing.yaml | 8 ++++++-- jxboot-resources/templates/700-chartmuseum-ing.yaml | 6 +++++- jxboot-resources/templates/700-deck-ing.yaml | 8 ++++++-- jxboot-resources/templates/700-docker-ing.yaml | 8 ++++++-- jxboot-resources/templates/700-hook-ing.yaml | 6 +++++- jxboot-resources/templates/700-jenkins-ing.yaml | 6 +++++- jxboot-resources/templates/700-nexus-ing.yaml | 8 ++++++-- jxboot-resources/templates/700-tide-ing.yaml | 8 ++++++-- 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/jxboot-resources/templates/700-bucketrepo-ing.yaml b/jxboot-resources/templates/700-bucketrepo-ing.yaml index 5c1a890..b3509c0 100644 --- a/jxboot-resources/templates/700-bucketrepo-ing.yaml +++ b/jxboot-resources/templates/700-bucketrepo-ing.yaml @@ -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 }} \ No newline at end of file +{{- end }} diff --git a/jxboot-resources/templates/700-chartmuseum-ing.yaml b/jxboot-resources/templates/700-chartmuseum-ing.yaml index 4e0c2a2..e9a3474 100644 --- a/jxboot-resources/templates/700-chartmuseum-ing.yaml +++ b/jxboot-resources/templates/700-chartmuseum-ing.yaml @@ -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" diff --git a/jxboot-resources/templates/700-deck-ing.yaml b/jxboot-resources/templates/700-deck-ing.yaml index e9a4ee5..9276a10 100644 --- a/jxboot-resources/templates/700-deck-ing.yaml +++ b/jxboot-resources/templates/700-deck-ing.yaml @@ -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 }} \ No newline at end of file +{{- end }} diff --git a/jxboot-resources/templates/700-docker-ing.yaml b/jxboot-resources/templates/700-docker-ing.yaml index 0e737db..adb4c7b 100644 --- a/jxboot-resources/templates/700-docker-ing.yaml +++ b/jxboot-resources/templates/700-docker-ing.yaml @@ -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 }} \ No newline at end of file +{{- end }} diff --git a/jxboot-resources/templates/700-hook-ing.yaml b/jxboot-resources/templates/700-hook-ing.yaml index 6de0289..324ce0e 100644 --- a/jxboot-resources/templates/700-hook-ing.yaml +++ b/jxboot-resources/templates/700-hook-ing.yaml @@ -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" diff --git a/jxboot-resources/templates/700-jenkins-ing.yaml b/jxboot-resources/templates/700-jenkins-ing.yaml index fed4c43..da83eae 100644 --- a/jxboot-resources/templates/700-jenkins-ing.yaml +++ b/jxboot-resources/templates/700-jenkins-ing.yaml @@ -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" diff --git a/jxboot-resources/templates/700-nexus-ing.yaml b/jxboot-resources/templates/700-nexus-ing.yaml index e408f25..580a8fc 100644 --- a/jxboot-resources/templates/700-nexus-ing.yaml +++ b/jxboot-resources/templates/700-nexus-ing.yaml @@ -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 }} \ No newline at end of file +{{- end }} diff --git a/jxboot-resources/templates/700-tide-ing.yaml b/jxboot-resources/templates/700-tide-ing.yaml index bdd59a7..632a46c 100644 --- a/jxboot-resources/templates/700-tide-ing.yaml +++ b/jxboot-resources/templates/700-tide-ing.yaml @@ -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 }} \ No newline at end of file +{{- end }}