From 9d6fe1b7b5a460ad2f2e09df07493d90d6baa79a Mon Sep 17 00:00:00 2001
From: Youssef El Houti <youssef.elhouti@gmail.com>
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 <youssef.elhouti@gmail.com>
---
 jxboot-resources/templates/700-bucketrepo-ing.yaml  | 6 ++++--
 jxboot-resources/templates/700-chartmuseum-ing.yaml | 4 +++-
 jxboot-resources/templates/700-deck-ing.yaml        | 6 ++++--
 jxboot-resources/templates/700-docker-ing.yaml      | 6 ++++--
 jxboot-resources/templates/700-hook-ing.yaml        | 4 +++-
 jxboot-resources/templates/700-jenkins-ing.yaml     | 4 +++-
 jxboot-resources/templates/700-nexus-ing.yaml       | 6 ++++--
 jxboot-resources/templates/700-tide-ing.yaml        | 6 ++++--
 8 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/jxboot-resources/templates/700-bucketrepo-ing.yaml b/jxboot-resources/templates/700-bucketrepo-ing.yaml
index 5c1a890..f7f03ca 100644
--- a/jxboot-resources/templates/700-bucketrepo-ing.yaml
+++ b/jxboot-resources/templates/700-bucketrepo-ing.yaml
@@ -22,8 +22,10 @@ spec:
     - bucketrepo{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-bucketrepo-{{ .Values.cluster.domain | replace "." "-" }}"
+{{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/jxboot-resources/templates/700-chartmuseum-ing.yaml b/jxboot-resources/templates/700-chartmuseum-ing.yaml
index 4e0c2a2..caa283e 100644
--- a/jxboot-resources/templates/700-chartmuseum-ing.yaml
+++ b/jxboot-resources/templates/700-chartmuseum-ing.yaml
@@ -23,8 +23,10 @@ spec:
     - chartmuseum{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-chartmuseum-{{ .Values.cluster.domain | replace "." "-" }}"
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/jxboot-resources/templates/700-deck-ing.yaml b/jxboot-resources/templates/700-deck-ing.yaml
index e9a4ee5..9bc4fe8 100644
--- a/jxboot-resources/templates/700-deck-ing.yaml
+++ b/jxboot-resources/templates/700-deck-ing.yaml
@@ -24,8 +24,10 @@ spec:
     - deck{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-deck-{{ .Values.cluster.domain | replace "." "-" }}"
+{{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/jxboot-resources/templates/700-docker-ing.yaml b/jxboot-resources/templates/700-docker-ing.yaml
index 0e737db..59bb35a 100644
--- a/jxboot-resources/templates/700-docker-ing.yaml
+++ b/jxboot-resources/templates/700-docker-ing.yaml
@@ -24,8 +24,10 @@ spec:
     - docker-registry{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-docker-{{ .Values.cluster.domain | replace "." "-" }}"
+{{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/jxboot-resources/templates/700-hook-ing.yaml b/jxboot-resources/templates/700-hook-ing.yaml
index 6de0289..cd923a8 100644
--- a/jxboot-resources/templates/700-hook-ing.yaml
+++ b/jxboot-resources/templates/700-hook-ing.yaml
@@ -22,8 +22,10 @@ spec:
     - hook{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-hook-{{ .Values.cluster.domain | replace "." "-" }}"
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/jxboot-resources/templates/700-jenkins-ing.yaml b/jxboot-resources/templates/700-jenkins-ing.yaml
index fed4c43..3a64c23 100644
--- a/jxboot-resources/templates/700-jenkins-ing.yaml
+++ b/jxboot-resources/templates/700-jenkins-ing.yaml
@@ -22,8 +22,10 @@ spec:
     - jenkins{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-jenkins-{{ .Values.cluster.domain | replace "." "-" }}"
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/jxboot-resources/templates/700-nexus-ing.yaml b/jxboot-resources/templates/700-nexus-ing.yaml
index e408f25..e6a7f32 100644
--- a/jxboot-resources/templates/700-nexus-ing.yaml
+++ b/jxboot-resources/templates/700-nexus-ing.yaml
@@ -22,8 +22,10 @@ spec:
     - nexus{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-nexus-{{ .Values.cluster.domain | replace "." "-" }}"
+{{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/jxboot-resources/templates/700-tide-ing.yaml b/jxboot-resources/templates/700-tide-ing.yaml
index bdd59a7..edc22f6 100644
--- a/jxboot-resources/templates/700-tide-ing.yaml
+++ b/jxboot-resources/templates/700-tide-ing.yaml
@@ -24,8 +24,10 @@ spec:
     - tide{{ .Values.cluster.namespaceSubDomain }}{{ .Values.cluster.domain }}
 {{- if eq .Values.certmanager.production "true" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-p"
-{{- else }}
+{{- else if eq .Values.certmanager.production "false" }}
     secretName: "tls-{{ .Values.cluster.domain | replace "." "-" }}-s"
+{{- else }}
+    secretName: "tls-tide-{{ .Values.cluster.domain | replace "." "-" }}"
+{{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file