Merge pull request #821 from bshephar/overrides-nil-pointer

Fix APIOverrides nil pointer in horizon.go

Author: openshift-merge-bot[bot]

pkg/openstack/horizon.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/route"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 
@@ -82,6 +83,18 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
 	//
 	apiOverrides := instance.Spec.Horizon.APIOverride
 
+	if apiOverrides.Route == nil {
+		apiOverrides.Route = &route.OverrideSpec{}
+	}
+
+	if apiOverrides.Route.EmbeddedLabelsAnnotations == nil {
+		apiOverrides.Route.EmbeddedLabelsAnnotations = &route.EmbeddedLabelsAnnotations{}
+	}
+
+	if apiOverrides.Route.Annotations == nil {
+		apiOverrides.Route.Annotations = map[string]string{}
+	}
+
 	if _, ok := apiOverrides.Route.Annotations[HorizonHSTSHeaderAnnotation]; !ok {
 		apiOverrides.Route.Annotations[HorizonHSTSHeaderAnnotation] = HorizonHSTSHeaderAnnotationValue
 	}

tests/functional/base_test.go

@@ -372,6 +372,9 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 		"glance": map[string]interface{}{
 			"enabled": false,
 		},
+		"horizon": map[string]interface{}{
+			"enabled": true,
+		},
 		"cinder": map[string]interface{}{
 			"enabled": false,
 		},