fix null pointer issue

Author: Peng Zhou

api/v1/common_types.go

@@ -98,8 +98,7 @@ type HAProxy struct {
 	// +kubebuilder:default:=false
 	PathBasedRouting *bool               `json:"pathBasedRouting,omitempty"`
 	Service          *corev1.ServiceType `json:"service,omitempty"`
-	// +kubebuilder:default:={enabled: false}
-	TcpPorts *Tcpports `json:"tcpPorts,omitempty"`
+	TcpPorts         *Tcpports           `json:"tcpPorts,omitempty"`
 	// +kubebuilder:default:={client: 600, connect: 600, server: 600}
 	Timeout Timeout `json:"timeout,omitempty"`
 	// +kubebuilder:default:={enabled: false, secretName: "", certFileName: ""}

config/crd/bases/marklogic.progress.com_marklogicclusters.yaml

@@ -4531,8 +4531,6 @@ spec:
                         type: integer
                     type: object
                   tcpPorts:
-                    default:
-                      enabled: false
                     properties:
                       enabled:
                         type: boolean
@@ -9306,8 +9304,6 @@ spec:
                               type: integer
                           type: object
                         tcpPorts:
-                          default:
-                            enabled: false
                           properties:
                             enabled:
                               type: boolean

pkg/k8sutil/haProxy.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"sort"
 
+	"context"
 	"github.com/cisco-open/k8s-objectmatcher/patch"
 	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
 	"github.com/marklogic/marklogic-operator-kubernetes/pkg/result"
@@ -33,7 +34,7 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
 	configmap := &corev1.ConfigMap{}
 	haproxyService := &corev1.Service{}
 	err := client.Get(cc.Ctx, nsName, configmap)
-	data := generateHAProxyConfigMapData(cc.MarklogicCluster)
+	data := generateHAProxyConfigMapData(cc.Ctx, cc.MarklogicCluster)
 	configMapDef := generateHAProxyConfigMap(objectMeta, marklogicClusterAsOwner(cr), data)
 	haproxyDeploymentDef := cc.createHAProxyDeploymentDef(objectMeta)
 	haproxyServiceDef := cc.generateHaproxyServiceDef(objectMeta)
@@ -143,7 +144,7 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
 }
 
 // generateHAProxyData generates the HAProxy Config Data
-func generateHAProxyConfigMapData(cr *marklogicv1.MarklogicCluster) map[string]string {
+func generateHAProxyConfigMapData(ctx context.Context, cr *marklogicv1.MarklogicCluster) map[string]string {
 	var result string
 	// HAProxy Config Data
 	haProxyData := make(map[string]string)
@@ -196,7 +197,7 @@ resolvers dns
 	result += parseTemplateToString(baseConfig, data) + "\n"
 	haProxyData["haproxy.cfg"] += result + "\n"
 
-	haproxyConfig := generateHAProxyConfig(cr)
+	haproxyConfig := generateHAProxyConfig(ctx, cr)
 
 	haProxyData["haproxy.cfg"] += generateFrontendConfig(cr, haproxyConfig) + "\n"
 	haProxyData["haproxy.cfg"] += generateBackendConfig(cr, haproxyConfig) + "\n"
@@ -231,7 +232,7 @@ func (cc *ClusterContext) createHAProxyDeploymentDef(meta metav1.ObjectMeta) *ap
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: meta.Labels,
 					Annotations: map[string]string{
-						"configmap-hash": calculateHash(generateHAProxyConfigMapData(cr)),
+						"configmap-hash": calculateHash(generateHAProxyConfigMapData(cc.Ctx, cr)),
 					},
 				},
 				Spec: corev1.PodSpec{

pkg/k8sutil/haProxyHelper.go

@@ -2,11 +2,12 @@ package k8sutil
 
 import (
 	"bytes"
+	"context"
 	"fmt"
+	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 	"strings"
 	"text/template"
-
-	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
 )
 
 type HAProxyTemplate struct {
@@ -63,7 +64,9 @@ type TCPConfig struct {
 	GroupName  string
 }
 
-func generateHAProxyConfig(cr *marklogicv1.MarklogicCluster) *HAProxyConfig {
+func generateHAProxyConfig(ctx context.Context, cr *marklogicv1.MarklogicCluster) *HAProxyConfig {
+	logger := log.FromContext(ctx)
+	logger.Info("Generating HAProxy configuration")
 	config := &HAProxyConfig{}
 	frontendMap := make(map[string]FrontEndConfig)
 	backendMap := make(map[string][]BackendConfig)
@@ -80,14 +83,21 @@ func generateHAProxyConfig(cr *marklogicv1.MarklogicCluster) *HAProxyConfig {
 				config.IsPathBased = true
 			}
 		}
+
+		groupHAConfig := group.HAProxy
+
+		if groupHAConfig == nil {
+			groupHAConfig = cr.Spec.HAProxy
+		}
+
 		// process tcp ports
-		if cr.Spec.HAProxy.TcpPorts != nil && group.HAProxy.TcpPorts != nil && group.HAProxy.TcpPorts.Enabled {
-			tcpPorts := cr.Spec.HAProxy.TcpPorts.Ports
-			if group.HAProxy != nil && group.HAProxy.TcpPorts != nil {
-				tcpPorts = group.HAProxy.TcpPorts.Ports
+		if groupHAConfig.TcpPorts != nil && groupHAConfig.TcpPorts.Enabled {
+			tcpPorts := []marklogicv1.TcpPort{}
+			if cr.Spec.HAProxy.TcpPorts != nil {
+				tcpPorts = cr.Spec.HAProxy.TcpPorts.Ports
 			}
-			if len(tcpPorts) == 0 {
-				tcpPorts = []marklogicv1.TcpPort{}
+			if groupHAConfig.TcpPorts != nil {
+				tcpPorts = groupHAConfig.TcpPorts.Ports
 			}
 			for _, tcpPort := range tcpPorts {
 				targetPort := int(tcpPort.TargetPort)
@@ -125,10 +135,10 @@ func generateHAProxyConfig(cr *marklogicv1.MarklogicCluster) *HAProxyConfig {
 		}
 
 		// process http ports with appServers
-		appServers := group.HAProxy.AppServers
+		appServers := groupHAConfig.AppServers
 		groupPathBased := *cr.Spec.HAProxy.PathBasedRouting
-		if group.HAProxy.PathBasedRouting != nil {
-			groupPathBased = *group.HAProxy.PathBasedRouting
+		if groupHAConfig.PathBasedRouting != nil {
+			groupPathBased = *groupHAConfig.PathBasedRouting
 		}
 		if len(appServers) == 0 {
 			appServers = defaultAppServer