From 4ccd0bdde3c349b125d0ae2d3eb2835e18390c76 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Wed, 5 Jan 2022 16:09:53 +0200
Subject: [PATCH] fix: Restore tlsSupport field in CheCluster CR sample (#1278)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 .../manifests/che-operator.clusterserviceversion.yaml        | 5 +++--
 config/samples/org.eclipse.che_v1_checluster.yaml            | 2 ++
 helmcharts/next/templates/org.eclipse.che_v1_checluster.yaml | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
index f0a793c9d..f63ace811 100644
--- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@@ -66,6 +66,7 @@ metadata:
               "proxyPort": "",
               "proxySecret": "",
               "proxyURL": "",
+              "tlsSupport": true,
               "workspaceNamespaceDefault": "<username>-che"
             },
             "storage": {
@@ -113,7 +114,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-openshift.v7.42.0-402.next
+  name: eclipse-che-preview-openshift.v7.42.0-403.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1455,4 +1456,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.42.0-402.next
+  version: 7.42.0-403.next
diff --git a/config/samples/org.eclipse.che_v1_checluster.yaml b/config/samples/org.eclipse.che_v1_checluster.yaml
index 5ba480da0..2cfa045bf 100644
--- a/config/samples/org.eclipse.che_v1_checluster.yaml
+++ b/config/samples/org.eclipse.che_v1_checluster.yaml
@@ -24,6 +24,8 @@ spec:
     cheWorkspaceClusterRole: ''
     # When enabled, the certificate from `che-git-self-signed-cert` ConfigMap will be propagated to the Che components and provide particular configuration for Git.
     gitSelfSignedCert: false
+    # Deprecated. Instructs the Operator to deploy Che in TLS mode. Disabling TLS sometimes cause malfunction of some Che components.
+    tlsSupport: true
     # URL (protocol+host name) of the proxy server. This drives the appropriate changes in the `JAVA_OPTS` and `https(s)_proxy` variables
     # in the Che server and workspaces containers.
     # Only use when configuring a proxy is required. Operator respects OpenShift cluster wide proxy configuration
diff --git a/helmcharts/next/templates/org.eclipse.che_v1_checluster.yaml b/helmcharts/next/templates/org.eclipse.che_v1_checluster.yaml
index e974ea32a..404ff832a 100644
--- a/helmcharts/next/templates/org.eclipse.che_v1_checluster.yaml
+++ b/helmcharts/next/templates/org.eclipse.che_v1_checluster.yaml
@@ -20,6 +20,7 @@ spec:
     cheClusterRoles: ''
     cheWorkspaceClusterRole: ''
     gitSelfSignedCert: false
+    tlsSupport: true
     proxyURL: ''
     proxyPort: ''
     proxySecret: ''