fix: jenkins-x-charts#31 ability to have one certificate per ingress

Signed-off-by: Youssef El Houti <youssef.elhouti@gmail.com>
yelhouti · Apr 21, 2020 · 9d6fe1b · 9d6fe1b
1 parent 0f8f16b
commit 9d6fe1b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git 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 }}
diff --git 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
@@ -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 }}
diff --git 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 }}
diff --git 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
@@ -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
@@ -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 }}
diff --git 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 }}