Remove selfSignedCertSecretName property (#15878)

* Remove selfSignedCertSecretName property Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
eclipse-che · Feb 26, 2020 · 579cb67 · 579cb67
1 parent 3af3742
commit 579cb67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/deploy/kubernetes/helm/che/templates/deployment.yaml b/deploy/kubernetes/helm/che/templates/deployment.yaml
@@ -100,24 +100,24 @@ spec:
           valueFrom:
             secretKeyRef:
               key: ca.crt
-              name: {{ .Values.global.tls.selfSignedCertSecretName }}
+              name: {{ .Values.global.tls.secretName }}
               optional: false
         {{- end }}
 
-        # If workspaces are created in a separate precreated namespace
+        # If workspaces are created in a separate namespace(s)
         # then configure Che Server to propagate TLS secret to workspaces' namespaces
-        {{- if not (contains "<" .Values.global.cheWorkspacesNamespace) }}
+        {{- if ne .Release.Namespace .Values.global.cheWorkspacesNamespace }}
         - name: "CHE_INFRA_KUBERNETES_TLS__CERT"
           valueFrom:
             secretKeyRef:
               key: tls.crt
-              name: {{ .Values.global.tls.secretName  }}
+              name: {{ .Values.global.tls.secretName }}
               optional: false
         - name: "CHE_INFRA_KUBERNETES_TLS__KEY"
           valueFrom:
             secretKeyRef:
               key: tls.key
-              name: {{ .Values.global.tls.secretName  }}
+              name: {{ .Values.global.tls.secretName }}
               optional: false
         {{- end }}
         {{- end }}

diff --git a/deploy/kubernetes/helm/che/values.yaml b/deploy/kubernetes/helm/che/values.yaml
@@ -45,10 +45,9 @@ global:
     ## it MUST be pre-created in the configured Che namespace
     secretName: che-tls
 
-    ## If self-signed certificate is enabled
-    ## then certificate from `tls.selfSignedCertSecretName` will be propagated to Che components' trust stores
+    ## If self-signed certificate flag is enabled
+    ## then CA certificate from `tls.secretName` will be propagated to Che components' trust stores
     useSelfSignedCerts: false
-    selfSignedCertSecretName: self-signed-cert
 
 
   ## If using git self-signed certificate is enabled