Merge branch 'master' into dashboard-fetch-rate-limit

grafana · May 8, 2022 · 537910e · 537910e
2 parents eaf1495 + a1245e3
commit 537910e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/controllers/model/grafanaService.go b/controllers/model/grafanaService.go
@@ -70,9 +70,11 @@ func GetGrafanaPort(cr *v1alpha1.Grafana) int {
 func getServicePorts(cr *v1alpha1.Grafana, currentState *v1.Service) []v1.ServicePort {
 	intPort := int32(GetGrafanaPort(cr))
 	nodePort := int32(0)
-	for _, nPort := range cr.Spec.Service.Ports {
-		if nPort.Port == 3000 {
-			nodePort = nPort.NodePort
+	if cr.Spec.Service != nil {
+		for _, nPort := range cr.Spec.Service.Ports {
+			if nPort.Port == 3000 {
+				nodePort = nPort.NodePort
+			}
 		}
 	}
 	defaultPorts := []v1.ServicePort{