devworkspace controller should create routing with empty host

devfile · Apr 16, 2021 · 4cdcd55 · 4cdcd55
1 parent 871c0c8
commit 4cdcd55
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 12 deletions.
diff --git a/apis/controller/v1alpha1/devworkspacerouting_types.go b/apis/controller/v1alpha1/devworkspacerouting_types.go
@@ -25,8 +25,6 @@ type DevWorkspaceRoutingSpec struct {
 	DevWorkspaceId string `json:"devworkspaceId"`
 	// Class of the routing: this drives which DevWorkspaceRouting controller will manage this routing
 	RoutingClass DevWorkspaceRoutingClass `json:"routingClass,omitempty"`
-	// Routing suffix for cluster
-	RoutingSuffix string `json:"routingSuffix"`
 	// Machines to endpoints map
 	Endpoints map[string]EndpointList `json:"endpoints"`
 	// Selector that should be used by created services to point to the devworkspace Pod

diff --git a/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go b/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go
@@ -115,7 +115,6 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result
 		DevWorkspaceId: instance.Spec.DevWorkspaceId,
 		Namespace:      instance.Namespace,
 		PodSelector:    instance.Spec.PodSelector,
-		RoutingSuffix:  instance.Spec.RoutingSuffix,
 	}
 
 	restrictedAccess, setRestrictedAccess := instance.Annotations[constants.DevWorkspaceRestrictedAccessAnnotation]

diff --git a/controllers/workspace/provision/routing.go b/controllers/workspace/provision/routing.go
@@ -177,7 +177,6 @@ func getSpecRouting(
 		Spec: v1alpha1.DevWorkspaceRoutingSpec{
 			DevWorkspaceId: workspace.Status.DevWorkspaceId,
 			RoutingClass:   v1alpha1.DevWorkspaceRoutingClass(routingClass),
-			RoutingSuffix:  config.ControllerCfg.GetRoutingSuffix(),
 			Endpoints:      endpoints,
 			PodSelector: map[string]string{
 				constants.DevWorkspaceIDLabel: workspace.Status.DevWorkspaceId,

diff --git a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceroutings.yaml b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceroutings.yaml
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -70,10 +70,6 @@ func (wc *ControllerConfig) GetExperimentalFeaturesEnabled() bool {
 	return wc.GetPropertyOrDefault(experimentalFeaturesEnabled, defaultExperimentalFeaturesEnabled) == "true"
 }
 
-func (wc *ControllerConfig) GetRoutingSuffix() string {
-	return wc.GetPropertyOrDefault(routingSuffix, defaultRoutingSuffix)
-}
-
 func (wc *ControllerConfig) GetPVCStorageClassName() *string {
 	return wc.GetProperty(workspacePVCStorageClassName)
 }