feat: adding the option to use saleor secretName for TLS

trieb-work · Apr 26, 2022 · c014e24 · c014e24
1 parent 4081d2a
commit c014e24
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/charts/saleor/Chart.yaml b/charts/saleor/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.43
+version: 0.1.44
 
 dependencies:
 - name: postgresql

diff --git a/charts/saleor/templates/ingress.yaml b/charts/saleor/templates/ingress.yaml
@@ -22,7 +22,11 @@ spec:
       {{- range .Values.ingress.hosts }}
         - {{ .host | quote }}
       {{- end }}
+      {{- if .Values.ingress.tls.secretName }}  
+      secretName:  {{ .Values.ingress.tls.secretName }}
+      {{- else }}
       secretName: "{{ $fullName }}-tls-secret"
+      {{- end }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}

diff --git a/charts/saleor/values.yaml b/charts/saleor/values.yaml
@@ -39,19 +39,14 @@ ingress:
   enabled: false
   annotations:
     cert-manager.io/acme-challenge-type: http01
-    cert-manager.io/cluster-issuer: letsencrypt-prod
+    cert-manager.io/cluster-issuer: letsencrypt-prod  
 
   hosts:
     - host: chart-example.local
       paths: 
         - '/graphql/'
   tls:
-    - secretName: ""
-      hosts:
-        - chart-example.local
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+    secretName:
 
 saleor:
   enableHpa: true