Use same portName as targetPort in service and fix Status bugs.

README.md

@@ -43,6 +43,10 @@ Please visit the following pages for documentation on using and developing the S
 
 ## Version Compatibility & Upgrade Notes
 
+#### v0.2.7
+- The `SolrCloud` and `SolrPrometheusExporter` services' portNames have changed to `"solr-client"` and `"solr-metrics"` from `"ext-solr-client"` and `"ext-solr-metrics"`, respectively.
+This is due to a bug in Kubernetes where `portName` and `targetPort` must match for services.
+
 #### v0.2.6
 - The solr-operator argument `--ingressBaseDomain` has been **DEPRECATED**.
 In order to set the external baseDomain of your clouds, please begin to use `SolrCloud.spec.solrAddressability.external.domainName` instead.

api/v1beta1/solrcloud_types.go

@@ -945,7 +945,7 @@ func (sc *SolrCloud) InternalNodeUrl(nodeName string, withPort bool) string {
 func (sc *SolrCloud) InternalCommonUrl(withPort bool) (url string) {
 	url = fmt.Sprintf("%s.%s", sc.CommonServiceName(), sc.Namespace) + sc.customKubeDomain()
 	if withPort {
-		url += sc.NodePortSuffix()
+		url += sc.CommonPortSuffix()
 	}
 	return url
 }

controllers/solrcloud_controller.go

@@ -325,8 +325,8 @@ func reconcileCloudStatus(r *SolrCloudReconciler, solrCloud *solr.SolrCloud, new
 		nodeStatus := solr.SolrNodeStatus{}
 		nodeStatus.Name = p.Name
 		nodeStatus.NodeName = p.Spec.NodeName
-		nodeStatus.InternalAddress = "http://" + solrCloud.InternalNodeUrl(nodeStatus.NodeName, true)
-		if solrCloud.Spec.SolrAddressability.External != nil {
+		nodeStatus.InternalAddress = "http://" + solrCloud.InternalNodeUrl(nodeStatus.Name, true)
+		if solrCloud.Spec.SolrAddressability.External != nil && !solrCloud.Spec.SolrAddressability.External.HideNodes {
 			nodeStatus.ExternalAddress = "http://" + solrCloud.ExternalNodeUrl(nodeStatus.Name, solrCloud.Spec.SolrAddressability.External.DomainName, true)
 		}
 		ready := false
@@ -376,7 +376,7 @@ func reconcileCloudStatus(r *SolrCloudReconciler, solrCloud *solr.SolrCloud, new
 	}
 
 	newStatus.InternalCommonAddress = "http://" + solrCloud.InternalCommonUrl(true)
-	if solrCloud.Spec.SolrAddressability.External != nil {
+	if solrCloud.Spec.SolrAddressability.External != nil && !solrCloud.Spec.SolrAddressability.External.HideCommon {
 		extAddress := "http://" + solrCloud.ExternalCommonUrl(solrCloud.Spec.SolrAddressability.External.DomainName, true)
 		newStatus.ExternalCommonAddress = &extAddress
 	}

controllers/solrcloud_controller_externaldns_test.go

@@ -122,6 +122,7 @@ func TestEDSCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "common service annotations", expectedCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 4000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
@@ -131,6 +132,7 @@ func TestEDSCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "headless service annotations", expectedHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 3000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -143,6 +145,12 @@ func TestEDSCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+":4000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.NotNil(t, instance.Status.ExternalCommonAddress, "External common address in Status should not be nil.")
+	assert.EqualValues(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+"."+testDomain+":4000", *instance.Status.ExternalCommonAddress, "Wrong external common address in status")
 }
 
 func TestEDSNoNodesCloudReconcile(t *testing.T) {
@@ -234,12 +242,14 @@ func TestEDSNoNodesCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "common service annotations", expectedCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 5000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
 	// Check the headless Service
 	service = expectService(t, g, requests, expectedCloudRequest, cloudHsKey, statefulSet.Spec.Template.Labels)
 	testMapsEqual(t, "headless service annotations", testHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 2000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -252,6 +262,12 @@ func TestEDSNoNodesCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+":5000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.NotNil(t, instance.Status.ExternalCommonAddress, "External common address in Status should not be nil.")
+	assert.EqualValues(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+"."+testDomain+":5000", *instance.Status.ExternalCommonAddress, "Wrong external common address in status")
 }
 
 func TestEDSNoCommonCloudReconcile(t *testing.T) {
@@ -340,6 +356,7 @@ func TestEDSNoCommonCloudReconcile(t *testing.T) {
 	// Check the client Service
 	service := expectService(t, g, requests, expectedCloudRequest, cloudCsKey, statefulSet.Spec.Template.Labels)
 	testMapsEqual(t, "common service annotations", testCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 2000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
@@ -349,6 +366,7 @@ func TestEDSNoCommonCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "headless service annotations", expectedHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 3000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -361,6 +379,11 @@ func TestEDSNoCommonCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+":2000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.Nil(t, instance.Status.ExternalCommonAddress, "External common address in status should be nil")
 }
 
 func TestEDSUseInternalAddressCloudReconcile(t *testing.T) {
@@ -452,6 +475,7 @@ func TestEDSUseInternalAddressCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "common service annotations", expectedCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 4000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
@@ -461,6 +485,7 @@ func TestEDSUseInternalAddressCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "headless service annotations", expectedHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 3000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -473,6 +498,12 @@ func TestEDSUseInternalAddressCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+":4000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.NotNil(t, instance.Status.ExternalCommonAddress, "External common address in Status should not be nil.")
+	assert.EqualValues(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+"."+testDomain+":4000", *instance.Status.ExternalCommonAddress, "Wrong external common address in status")
 }
 
 func TestEDSExtraDomainsCloudReconcile(t *testing.T) {
@@ -569,6 +600,7 @@ func TestEDSExtraDomainsCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": hostnameAnnotation,
 	})
 	testMapsEqual(t, "common service annotations", expectedCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 4000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
@@ -578,6 +610,7 @@ func TestEDSExtraDomainsCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": hostnameAnnotation,
 	})
 	testMapsEqual(t, "headless service annotations", expectedHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 3000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -590,6 +623,12 @@ func TestEDSExtraDomainsCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+":4000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.NotNil(t, instance.Status.ExternalCommonAddress, "External common address in Status should not be nil.")
+	assert.EqualValues(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+"."+testDomain+":4000", *instance.Status.ExternalCommonAddress, "Wrong external common address in status")
 }
 
 func TestEDSKubeDomainCloudReconcile(t *testing.T) {
@@ -682,12 +721,14 @@ func TestEDSKubeDomainCloudReconcile(t *testing.T) {
 		"external-dns.alpha.kubernetes.io/hostname": instance.Namespace + "." + testDomain,
 	})
 	testMapsEqual(t, "common service annotations", expectedCommonServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 5000, service.Spec.Ports[0].Port, "Wrong port on common Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on common Service")
 
 	// Check the headless Service
 	service = expectService(t, g, requests, expectedCloudRequest, cloudHsKey, statefulSet.Spec.Template.Labels)
 	testMapsEqual(t, "headless service annotations", testHeadlessServiceAnnotations, service.Annotations)
+	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].Name, "Wrong port name on common Service")
 	assert.EqualValues(t, 2000, service.Spec.Ports[0].Port, "Wrong port on headless Service")
 	assert.EqualValues(t, "solr-client", service.Spec.Ports[0].TargetPort.StrVal, "Wrong podPort name on headless Service")
 
@@ -700,4 +741,10 @@ func TestEDSKubeDomainCloudReconcile(t *testing.T) {
 
 	// Check the ingress
 	expectNoIngress(g, cloudIKey)
+
+	// Check that the Addresses in the status are correct
+	g.Eventually(func() error { return testClient.Get(context.TODO(), expectedCloudRequest.NamespacedName, instance) }, timeout).Should(gomega.Succeed())
+	assert.Equal(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+".svc."+testKubeDomain+":5000", instance.Status.InternalCommonAddress, "Wrong internal common address in status")
+	assert.NotNil(t, instance.Status.ExternalCommonAddress, "External common address in Status should not be nil.")
+	assert.EqualValues(t, "http://"+cloudCsKey.Name+"."+instance.Namespace+"."+testDomain+":5000", *instance.Status.ExternalCommonAddress, "Wrong external common address in status")
 }