From 579cb6754823e6f13f5f3c99505f43ffa98da978 Mon Sep 17 00:00:00 2001 From: Mykola Morhun Date: Wed, 26 Feb 2020 11:26:31 +0200 Subject: [PATCH] Remove selfSignedCertSecretName property (#15878) * Remove selfSignedCertSecretName property Signed-off-by: Mykola Morhun --- deploy/kubernetes/helm/che/templates/deployment.yaml | 10 +++++----- deploy/kubernetes/helm/che/values.yaml | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/deploy/kubernetes/helm/che/templates/deployment.yaml b/deploy/kubernetes/helm/che/templates/deployment.yaml index 9a7db34dae..c09aa4bae6 100644 --- 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 index 2d9084ecb4..e1fd7855a4 100644 --- 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