diff --git a/deploy/crds/org_v1_che_cr.yaml b/deploy/crds/org_v1_che_cr.yaml index 9656676f96..fcf12b0014 100644 --- a/deploy/crds/org_v1_che_cr.yaml +++ b/deploy/crds/org_v1_che_cr.yaml @@ -16,8 +16,6 @@ metadata: name: eclipse-che spec: server: - # Use internal cluster SVC names to communicate between components to speed up the traffic and avoid proxy issues. - useInternalClusterSVCNames: true # Specifies a variation of the installation. The options are `che` for upstream Che installations, or `codeready` for link:https://developers.redhat.com/products/codeready-workspaces/overview[CodeReady Workspaces] installation. # Override the default value only on necessary occasions. cheFlavor: '' @@ -161,7 +159,7 @@ spec: # All the endpoints whether backed by the ingress or gateway `route` always point to the subpaths on the same domain. Defaults to `native`. singleHostExposureType: '' metrics: - # Enables `metrics` the Che server endpoint. + # Enables `metrics` the Che server endpoint. enable: true devWorkspace: # Deploys the DevWorkspace Operator in the cluster. diff --git a/deploy/crds/org_v1_che_crd-v1beta1.yaml b/deploy/crds/org_v1_che_crd-v1beta1.yaml index 846f643dd9..ec0258647d 100644 --- a/deploy/crds/org_v1_che_crd-v1beta1.yaml +++ b/deploy/crds/org_v1_che_crd-v1beta1.yaml @@ -700,6 +700,10 @@ spec: description: Deprecated in favor of `externalDevfileRegistries` fields. type: string + disableInternalClusterSVCNames: + description: Disable internal cluster SVC names usage to communicate + between components to speed up the traffic and avoid proxy issues. + type: boolean externalDevfileRegistries: description: External devfile registries, that serves sample, ready-to-use devfiles. Configure this in addition to a dedicated devfile registry @@ -909,9 +913,7 @@ spec: cause malfunction of some Che components. type: boolean useInternalClusterSVCNames: - description: Use internal cluster SVC names to communicate between - components to speed up the traffic and avoid proxy issues. The - default value is `true`. + description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceNamespaceDefault: description: Defines Kubernetes default namespace in which user's diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml index fa350cf29d..b449cc4b9f 100644 --- a/deploy/crds/org_v1_che_crd.yaml +++ b/deploy/crds/org_v1_che_crd.yaml @@ -714,6 +714,10 @@ spec: description: Deprecated in favor of `externalDevfileRegistries` fields. type: string + disableInternalClusterSVCNames: + description: Disable internal cluster SVC names usage to communicate + between components to speed up the traffic and avoid proxy issues. + type: boolean externalDevfileRegistries: description: External devfile registries, that serves sample, ready-to-use devfiles. Configure this in addition to a dedicated @@ -926,9 +930,7 @@ spec: cause malfunction of some Che components. type: boolean useInternalClusterSVCNames: - description: Use internal cluster SVC names to communicate between - components to speed up the traffic and avoid proxy issues. The - default value is `true`. + description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceNamespaceDefault: description: Defines Kubernetes default namespace in which user's diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index 579fafff90..85a68ce88d 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -69,7 +69,6 @@ metadata: "serverExposureStrategy": "", "serverTrustStoreConfigMapName": "", "tlsSupport": true, - "useInternalClusterSVCNames": true, "workspaceNamespaceDefault": "-che" }, "storage": { @@ -86,13 +85,13 @@ metadata: categories: Developer Tools certified: "false" containerImage: quay.io/eclipse/che-operator:next - createdAt: "2021-07-07T09:30:36Z" + createdAt: "2021-07-13T06:53:00Z" description: A Kube-native development solution that delivers portable and collaborative developer workspaces. operatorframework.io/suggested-namespace: eclipse-che repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che-preview-kubernetes.v7.33.0-250.nightly + name: eclipse-che-preview-kubernetes.v7.33.0-252.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -1241,4 +1240,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.33.0-250.nightly + version: 7.33.0-252.nightly diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml index fa350cf29d..b449cc4b9f 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml @@ -714,6 +714,10 @@ spec: description: Deprecated in favor of `externalDevfileRegistries` fields. type: string + disableInternalClusterSVCNames: + description: Disable internal cluster SVC names usage to communicate + between components to speed up the traffic and avoid proxy issues. + type: boolean externalDevfileRegistries: description: External devfile registries, that serves sample, ready-to-use devfiles. Configure this in addition to a dedicated @@ -926,9 +930,7 @@ spec: cause malfunction of some Che components. type: boolean useInternalClusterSVCNames: - description: Use internal cluster SVC names to communicate between - components to speed up the traffic and avoid proxy issues. The - default value is `true`. + description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceNamespaceDefault: description: Defines Kubernetes default namespace in which user's diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index fc23423719..41e489cf3e 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -60,7 +60,6 @@ metadata: "serverExposureStrategy": "", "serverTrustStoreConfigMapName": "", "tlsSupport": true, - "useInternalClusterSVCNames": true, "workspaceNamespaceDefault": "-che" }, "storage": { @@ -77,13 +76,13 @@ metadata: categories: Developer Tools, OpenShift Optional certified: "false" containerImage: quay.io/eclipse/che-operator:next - createdAt: "2021-07-07T09:30:48Z" + createdAt: "2021-07-13T06:53:08Z" description: A Kube-native development solution that delivers portable and collaborative developer workspaces in OpenShift. operatorframework.io/suggested-namespace: eclipse-che repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che-preview-openshift.v7.33.0-250.nightly + name: eclipse-che-preview-openshift.v7.33.0-252.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -1318,4 +1317,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.33.0-250.nightly + version: 7.33.0-252.nightly diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml index 5941286675..a385b23d6a 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml @@ -726,6 +726,11 @@ spec: description: Deprecated in favor of `externalDevfileRegistries` fields. type: string + disableInternalClusterSVCNames: + description: Disable internal cluster SVC names usage to communicate + between components to speed up the traffic and avoid proxy + issues. + type: boolean externalDevfileRegistries: description: External devfile registries, that serves sample, ready-to-use devfiles. Configure this in addition to a dedicated @@ -941,9 +946,7 @@ spec: cause malfunction of some Che components. type: boolean useInternalClusterSVCNames: - description: Use internal cluster SVC names to communicate between - components to speed up the traffic and avoid proxy issues. - The default value is `true`. + description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceNamespaceDefault: description: Defines Kubernetes default namespace in which user's diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go index a287168d68..504fd306d5 100644 --- a/pkg/apis/org/v1/che_types.go +++ b/pkg/apis/org/v1/che_types.go @@ -137,10 +137,12 @@ type CheClusterSpecServer struct { // Deprecated. Instructs the Operator to deploy Che in TLS mode. This is enabled by default. Disabling TLS sometimes cause malfunction of some Che components. // +optional TlsSupport bool `json:"tlsSupport"` - // Use internal cluster SVC names to communicate between components to speed up the traffic and avoid proxy issues. - // The default value is `true`. + // Deprecated in favor of `disableInternalClusterSVCNames`. // +optional UseInternalClusterSVCNames bool `json:"useInternalClusterSVCNames"` + // Disable internal cluster SVC names usage to communicate between components to speed up the traffic and avoid proxy issues. + // +optional + DisableInternalClusterSVCNames *bool `json:"disableInternalClusterSVCNames"` // Overrides the container image used in the dashboard deployment. // This includes the image tag. Omit it or leave it empty to use the default container image provided by the Operator. // +optional @@ -748,3 +750,7 @@ func (c *CheCluster) IsAirGapMode() bool { func (c *CheCluster) IsImagePullerSpecEmpty() bool { return c.Spec.ImagePuller.Spec == (chev1alpha1.KubernetesImagePullerSpec{}) } + +func (c *CheCluster) IsInternalClusterSVCNamesEnabled() bool { + return c.Spec.Server.DisableInternalClusterSVCNames == nil || !*c.Spec.Server.DisableInternalClusterSVCNames +} diff --git a/pkg/apis/org/v1/zz_generated.deepcopy.go b/pkg/apis/org/v1/zz_generated.deepcopy.go index a841b29f52..5bac29a92e 100644 --- a/pkg/apis/org/v1/zz_generated.deepcopy.go +++ b/pkg/apis/org/v1/zz_generated.deepcopy.go @@ -523,6 +523,11 @@ func (in *CheClusterSpecMetrics) DeepCopy() *CheClusterSpecMetrics { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CheClusterSpecServer) DeepCopyInto(out *CheClusterSpecServer) { *out = *in + if in.DisableInternalClusterSVCNames != nil { + in, out := &in.DisableInternalClusterSVCNames, &out.DisableInternalClusterSVCNames + *out = new(bool) + **out = **in + } in.DashboardIngress.DeepCopyInto(&out.DashboardIngress) in.DashboardRoute.DeepCopyInto(&out.DashboardRoute) in.DevfileRegistryIngress.DeepCopyInto(&out.DevfileRegistryIngress) diff --git a/pkg/controller/che/proxy.go b/pkg/controller/che/proxy.go index 90ffc99117..4624ff6bef 100644 --- a/pkg/controller/che/proxy.go +++ b/pkg/controller/che/proxy.go @@ -61,7 +61,7 @@ func (r *ReconcileChe) getProxyConfiguration(deployContext *deploy.DeployContext if err != nil { return nil, err } - if deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames { + if deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() { cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, ".svc") } return cheClusterProxyConf, nil diff --git a/pkg/controller/che/proxy_test.go b/pkg/controller/che/proxy_test.go index 7eea7169b2..1c1f7c1939 100644 --- a/pkg/controller/che/proxy_test.go +++ b/pkg/controller/che/proxy_test.go @@ -26,6 +26,7 @@ import ( fakeDiscovery "k8s.io/client-go/discovery/fake" fakeclientset "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/scheme" + "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" @@ -249,9 +250,10 @@ func TestReadProxyConfiguration(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - ProxyURL: "http://proxy", - ProxyPort: "3128", - NonProxyHosts: "host1", + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ProxyURL: "http://proxy", + ProxyPort: "3128", + NonProxyHosts: "host1", }, }, }, @@ -281,10 +283,9 @@ func TestReadProxyConfiguration(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - ProxyURL: "http://proxy", - ProxyPort: "3128", - NonProxyHosts: "host1", - UseInternalClusterSVCNames: true, + ProxyURL: "http://proxy", + ProxyPort: "3128", + NonProxyHosts: "host1", }, }, }, diff --git a/pkg/deploy/identity-provider/deployment_keycloak.go b/pkg/deploy/identity-provider/deployment_keycloak.go index 5b44078d3d..2362320379 100644 --- a/pkg/deploy/identity-provider/deployment_keycloak.go +++ b/pkg/deploy/identity-provider/deployment_keycloak.go @@ -517,7 +517,7 @@ func GetSpecKeycloakDeployment( } var enableFixedHostNameProvider string - if deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames { + if deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() { if cheFlavor == "che" { keycloakURL, err := url.Parse(deployContext.CheCluster.Status.KeycloakURL) if err != nil { diff --git a/pkg/deploy/server/server_configmap.go b/pkg/deploy/server/server_configmap.go index 9a750ae9a3..b8b19a7556 100644 --- a/pkg/deploy/server/server_configmap.go +++ b/pkg/deploy/server/server_configmap.go @@ -189,7 +189,7 @@ func (s *Server) getCheConfigMapData() (cheEnv map[string]string, err error) { cheAPI := protocol + "://" + cheHost + "/api" var keycloakInternalURL, pluginRegistryInternalURL, devfileRegistryInternalURL, cheInternalAPI, webSocketEndpoint, webSocketEndpointMinor string - if s.deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames && !s.deployContext.CheCluster.Spec.Auth.ExternalIdentityProvider { + if s.deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() && !s.deployContext.CheCluster.Spec.Auth.ExternalIdentityProvider { keycloakInternalURL = fmt.Sprintf("%s://%s.%s.svc:8080/auth", "http", deploy.IdentityProviderName, s.deployContext.CheCluster.Namespace) } else { keycloakInternalURL = keycloakURL @@ -197,20 +197,20 @@ func (s *Server) getCheConfigMapData() (cheEnv map[string]string, err error) { // If there is a devfile registry deployed by operator if !s.deployContext.CheCluster.Spec.Server.ExternalDevfileRegistry { - if s.deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames { + if s.deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() { devfileRegistryInternalURL = fmt.Sprintf("http://%s.%s.svc:8080", deploy.DevfileRegistryName, s.deployContext.CheCluster.Namespace) } else { devfileRegistryInternalURL = s.deployContext.CheCluster.Status.DevfileRegistryURL } } - if s.deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames && !s.deployContext.CheCluster.Spec.Server.ExternalPluginRegistry { + if s.deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() && !s.deployContext.CheCluster.Spec.Server.ExternalPluginRegistry { pluginRegistryInternalURL = fmt.Sprintf("http://%s.%s.svc:8080/v3", deploy.PluginRegistryName, s.deployContext.CheCluster.Namespace) } else { pluginRegistryInternalURL = pluginRegistryURL } - if s.deployContext.CheCluster.Spec.Server.UseInternalClusterSVCNames { + if s.deployContext.CheCluster.IsInternalClusterSVCNamesEnabled() { cheInternalAPI = fmt.Sprintf("http://%s.%s.svc:8080/api", deploy.CheServiceName, s.deployContext.CheCluster.Namespace) webSocketEndpoint = fmt.Sprintf("ws://%s.%s.svc:8080/api/websocket", deploy.CheServiceName, s.deployContext.CheCluster.Namespace) webSocketEndpointMinor = fmt.Sprintf("ws://%s.%s.svc:8080/api/websocket-minor", deploy.CheServiceName, s.deployContext.CheCluster.Namespace) diff --git a/pkg/deploy/server/server_configmap_test.go b/pkg/deploy/server/server_configmap_test.go index 4e225e67d2..e5cf0a636a 100644 --- a/pkg/deploy/server/server_configmap_test.go +++ b/pkg/deploy/server/server_configmap_test.go @@ -18,6 +18,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/utils/pointer" orgv1 "github.com/eclipse-che/che-operator/pkg/apis/org/v1" "github.com/eclipse-che/che-operator/pkg/util" @@ -155,8 +156,7 @@ func TestConfigMap(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - CheHost: "che-host", - UseInternalClusterSVCNames: true, + CheHost: "che-host", }, }, }, @@ -174,8 +174,8 @@ func TestConfigMap(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - CheHost: "che-host", - UseInternalClusterSVCNames: false, + CheHost: "che-host", + DisableInternalClusterSVCNames: pointer.BoolPtr(true), }, }, }, @@ -360,8 +360,7 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalDevfileRegistry: true, + ExternalDevfileRegistry: true, ExternalDevfileRegistries: []orgv1.ExternalDevfileRegistries{ {Url: "http://devfile-registry.external.1"}, }, @@ -385,9 +384,8 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalDevfileRegistry: true, - DevfileRegistryUrl: "http://devfile-registry.external.1", + ExternalDevfileRegistry: true, + DevfileRegistryUrl: "http://devfile-registry.external.1", ExternalDevfileRegistries: []orgv1.ExternalDevfileRegistries{ {Url: "http://devfile-registry.external.2"}, }, @@ -411,9 +409,9 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - ExternalDevfileRegistry: true, - DevfileRegistryUrl: "http://devfile-registry.external.1", + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ExternalDevfileRegistry: true, + DevfileRegistryUrl: "http://devfile-registry.external.1", ExternalDevfileRegistries: []orgv1.ExternalDevfileRegistries{ {Url: "http://devfile-registry.external.2"}, }, @@ -437,8 +435,8 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - ExternalDevfileRegistry: false, + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ExternalDevfileRegistry: false, }, }, Status: orgv1.CheClusterStatus{ @@ -462,8 +460,7 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalDevfileRegistry: false, + ExternalDevfileRegistry: false, }, }, Status: orgv1.CheClusterStatus{ @@ -487,9 +484,9 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - ExternalDevfileRegistry: false, - DevfileRegistryUrl: "http://devfile-registry.external.1", + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ExternalDevfileRegistry: false, + DevfileRegistryUrl: "http://devfile-registry.external.1", ExternalDevfileRegistries: []orgv1.ExternalDevfileRegistries{ {Url: "http://devfile-registry.external.2"}, }, @@ -516,9 +513,8 @@ func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalDevfileRegistry: false, - DevfileRegistryUrl: "http://devfile-registry.external.1", + ExternalDevfileRegistry: false, + DevfileRegistryUrl: "http://devfile-registry.external.1", ExternalDevfileRegistries: []orgv1.ExternalDevfileRegistries{ {Url: "http://devfile-registry.external.2"}, }, @@ -575,8 +571,7 @@ func TestShouldSetUpCorrectlyInternalPluginRegistryServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalPluginRegistry: true, + ExternalPluginRegistry: true, }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -602,8 +597,8 @@ func TestShouldSetUpCorrectlyInternalPluginRegistryServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - ExternalPluginRegistry: true, + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ExternalPluginRegistry: true, }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -629,8 +624,8 @@ func TestShouldSetUpCorrectlyInternalPluginRegistryServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - ExternalPluginRegistry: false, + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + ExternalPluginRegistry: false, }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -656,8 +651,7 @@ func TestShouldSetUpCorrectlyInternalPluginRegistryServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - ExternalPluginRegistry: false, + ExternalPluginRegistry: false, }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -713,8 +707,8 @@ func TestShouldSetUpCorrectlyInternalCheServerURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, - CheHost: "che-host", + DisableInternalClusterSVCNames: pointer.BoolPtr(true), + CheHost: "che-host", }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -737,8 +731,7 @@ func TestShouldSetUpCorrectlyInternalCheServerURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - CheHost: "http://che-host", + CheHost: "http://che-host", }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -790,9 +783,6 @@ func TestShouldSetUpCorrectlyInternalIdentityProviderServiceURL(t *testing.T) { Namespace: "eclipse-che", }, Spec: orgv1.CheClusterSpec{ - Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), ExternalIdentityProvider: true, @@ -816,9 +806,6 @@ func TestShouldSetUpCorrectlyInternalIdentityProviderServiceURL(t *testing.T) { Namespace: "eclipse-che", }, Spec: orgv1.CheClusterSpec{ - Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), ExternalIdentityProvider: true, @@ -843,7 +830,7 @@ func TestShouldSetUpCorrectlyInternalIdentityProviderServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, + DisableInternalClusterSVCNames: pointer.BoolPtr(true), }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -869,7 +856,7 @@ func TestShouldSetUpCorrectlyInternalIdentityProviderServiceURL(t *testing.T) { }, Spec: orgv1.CheClusterSpec{ Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: false, + DisableInternalClusterSVCNames: pointer.BoolPtr(true), }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), @@ -894,9 +881,6 @@ func TestShouldSetUpCorrectlyInternalIdentityProviderServiceURL(t *testing.T) { Namespace: "eclipse-che", }, Spec: orgv1.CheClusterSpec{ - Server: orgv1.CheClusterSpecServer{ - UseInternalClusterSVCNames: true, - }, Auth: orgv1.CheClusterSpecAuth{ OpenShiftoAuth: util.NewBoolPointer(false), ExternalIdentityProvider: false,