backwards compatibility with generated route name

Makefile

@@ -2,7 +2,7 @@ SHELL=/bin/bash
 REG=quay.io
 ORG=integreatly
 IMAGE=tutorial-web-app-operator
-TAG=0.0.48
+TAG=v0.0.48
 KUBE_CMD=oc apply -f
 DEPLOY_DIR=deploy
 OUT_STATIC_DIR=tmp/_output

deploy/crd.yaml

@@ -29,8 +29,6 @@ spec:
           properties:
             app_label:
               type: string
-            routingSubdomain:
-              type: string
             template:
               type: object
               properties:

pkg/apis/integreatly/v1alpha1/types.go

@@ -22,9 +22,8 @@ type WebApp struct {
 }
 
 type WebAppSpec struct {
-	AppLabel         string         `json:"app_label"`
-	Template         WebAppTemplate `json:"template"`
-	RoutingSubdomain string         `json:"routingSubdomain"`
+	AppLabel string         `json:"app_label"`
+	Template WebAppTemplate `json:"template"`
 }
 
 type WebAppStatus struct {

pkg/handlers/webhandler.go

@@ -230,7 +230,7 @@ func (h *AppHandler) GetRuntimeObjs(exts []runtime.RawExtension) ([]runtime.Obje
 }
 
 func (h *AppHandler) CreateRoute(cr *v1alpha1.WebApp) *routev1.Route {
-	return &routev1.Route{
+	route := &routev1.Route{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Route",
 			APIVersion: "route.openshift.io/v1",
@@ -241,7 +241,6 @@ func (h *AppHandler) CreateRoute(cr *v1alpha1.WebApp) *routev1.Route {
 			Labels:    cr.GetLabels(),
 		},
 		Spec: routev1.RouteSpec{
-			Host: fmt.Sprintf("%s.%s", routeName, cr.Spec.RoutingSubdomain),
 			TLS: &routev1.TLSConfig{
 				Termination: routev1.TLSTerminationEdge,
 			},
@@ -251,6 +250,11 @@ func (h *AppHandler) CreateRoute(cr *v1alpha1.WebApp) *routev1.Route {
 			},
 		},
 	}
+	subdomain := cr.Spec.Template.Parameters["ROUTING_SUBDOMAIN"]
+	if subdomain != "" {
+		route.Spec.Host = fmt.Sprintf("%s.%s", routeName, subdomain)
+	}
+	return route
 }
 
 func (h *AppHandler) ProvisionObjects(objects []runtime.Object, cr *v1alpha1.WebApp) error {