Removing port mapping from headless service. (#87)

Note: This will change the hostname and port of all SolrClouds utilizing headlessServices

Author: HoustonPutman

README.md

@@ -127,7 +127,7 @@ service/example-solrcloud-1                ClusterIP   ##.###.##.#      <none>
 service/example-solrcloud-2                ClusterIP   ##.###.###.##    <none>        80/TCP                47h
 service/example-solrcloud-3                ClusterIP   ##.###.##.###    <none>        80/TCP                47h
 service/example-solrcloud-common           ClusterIP   ##.###.###.###   <none>        80/TCP                47h
-service/example-solrcloud-headless         ClusterIP   None             <none>        80/TCP                47h
+service/example-solrcloud-headless         ClusterIP   None             <none>        8983/TCP              47h
 service/example-solrcloud-zk-client        ClusterIP   ##.###.###.###   <none>        21210/TCP             49d
 service/example-solrcloud-zk-headless      ClusterIP   None             <none>        22210/TCP,23210/TCP   49d
 
@@ -407,6 +407,9 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/mast
 
 ## Version Compatibility & Upgrade Notes
 
+#### v0.2.3
+- If you do not use an ingress with the Solr Operator, the Solr Hostname and Port will change when upgrading to this version. This is to fix an outstanding bug. Because of the headless service port change, you will likely see an outage for inter-node communication until all pods have been restarted.
+
 #### v0.2.2
 - `SolrCloud.spec.solrPodPolicy` has been **DEPRECATED** in favor of the `SolrCloud.spec.customSolrKubeOptions.podOptions` option.  
 This option is backwards compatible, but will be removed in a future version (`v0.3.0`).

api/v1beta1/solrcloud_types.go

@@ -699,6 +699,34 @@ func (sc *SolrCloud) NodeIngressUrl(nodeName string, ingressBaseUrl string) stri
 	return fmt.Sprintf("%s.%s", sc.NodeIngressPrefix(nodeName), ingressBaseUrl)
 }
 
+func (sc *SolrCloud) NodeHeadlessUrl(nodeName string, withPort bool) string {
+	url := fmt.Sprintf("%s.%s.%s", nodeName, sc.HeadlessServiceName(), sc.Namespace)
+	if withPort {
+		url += ":8983"
+	}
+	return url
+}
+
+func (sc *SolrCloud) NodeServiceUrl(nodeName string) string {
+	return fmt.Sprintf("%s.%s", nodeName, sc.Namespace)
+}
+
+func (sc *SolrCloud) InternalNodeUrl(nodeName string, useHeadlessService bool, withPort bool) string {
+	if useHeadlessService {
+		return sc.NodeHeadlessUrl(nodeName, withPort)
+	} else {
+		return sc.NodeServiceUrl(nodeName)
+	}
+}
+
+func (sc *SolrCloud) ExternalNodeUrl(nodeName string, ingressBaseDomain string, withPort bool) string {
+	if ingressBaseDomain == "" {
+		return sc.NodeHeadlessUrl(nodeName, withPort)
+	} else {
+		return sc.NodeIngressUrl(nodeName, ingressBaseDomain)
+	}
+}
+
 func (sc *SolrCloud) SharedLabels() map[string]string {
 	return sc.SharedLabelsWith(map[string]string{})
 }

controllers/solrcloud_controller.go

@@ -322,7 +322,7 @@ func reconcileCloudStatus(r *SolrCloudReconciler, solrCloud *solr.SolrCloud, new
 		nodeNames[idx] = p.Name
 		nodeStatus := solr.SolrNodeStatus{}
 		nodeStatus.NodeName = p.Name
-		nodeStatus.InternalAddress = fmt.Sprintf("http://%s.%s.svc.cluster.local", p.Name, p.Namespace)
+		nodeStatus.InternalAddress = "http://" + solrCloud.InternalNodeUrl(nodeStatus.NodeName, IngressBaseUrl == "", true)
 		if IngressBaseUrl != "" {
 			nodeStatus.ExternalAddress = "http://" + solrCloud.NodeIngressUrl(nodeStatus.NodeName, IngressBaseUrl)
 		}

controllers/solrcloud_controller_test.go

@@ -115,7 +115,7 @@ func TestCloudReconcile(t *testing.T) {
 	// Env Variable Tests
 	expectedEnvVars := map[string]string{
 		"ZK_HOST":        "host:7271/",
-		"SOLR_HOST":      "$(POD_HOSTNAME)." + instance.HeadlessServiceName(),
+		"SOLR_HOST":      "$(POD_HOSTNAME)." + instance.HeadlessServiceName() + "." + instance.Namespace,
 		"SOLR_JAVA_MEM":  "-Xmx4G",
 		"SOLR_PORT":      "8983",
 		"SOLR_LOG_LEVEL": "DEBUG",

controllers/util/solr_util.go

@@ -164,9 +164,10 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl
 	}
 
 	// if an ingressBaseDomain is provided, the node should be addressable outside of the cluster
-	solrHostName := "$(POD_HOSTNAME)." + solrCloud.HeadlessServiceName()
+	solrHostName := solrCloud.ExternalNodeUrl("$(POD_HOSTNAME)", ingressBaseDomain, false)
+	solrAdressingPort := 8983
 	if ingressBaseDomain != "" {
-		solrHostName = solrCloud.NodeIngressUrl("$(POD_HOSTNAME)", ingressBaseDomain)
+		solrAdressingPort = 80
 	}
 
 	// Environment Variables
@@ -279,6 +280,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl
 								},
 							},
 							VolumeMounts: volumeMounts,
+							Args:         []string{"-DhostPort=" + strconv.Itoa(solrAdressingPort)},
 							Env:          envVars,
 							LivenessProbe: &corev1.Probe{
 								InitialDelaySeconds: 20,
@@ -471,7 +473,7 @@ func GenerateConfigMap(solrCloud *solr.SolrCloud) *corev1.ConfigMap {
 <solr>
   <solrcloud>
     <str name="host">${host:}</str>
-    <int name="hostPort">80</int>
+    <int name="hostPort">${hostPort:80}</int>
     <str name="hostContext">${hostContext:solr}</str>
     <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
     <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
@@ -569,7 +571,7 @@ func GenerateHeadlessService(solrCloud *solr.SolrCloud) *corev1.Service {
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
-				{Name: ExtSolrClientPortName, Port: ExtSolrClientPort, Protocol: corev1.ProtocolTCP, TargetPort: intstr.FromInt(SolrClientPort)},
+				{Name: SolrClientPortName, Port: SolrClientPort, Protocol: corev1.ProtocolTCP, TargetPort: intstr.FromInt(SolrClientPort)},
 			},
 			Selector:                 selectorLabels,
 			ClusterIP:                corev1.ClusterIPNone,