Expose the new metrics port in the all-pods service

CHANGELOG.md

@@ -24,6 +24,7 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
 * [ENHANCEMENT] [#315](https://github.com/k8ssandra/cass-operator/issues/351) PodTemplateSpec allows setting Affinities, which are merged with the current rules. PodAntiAffinity behavior has changed, if allowMultipleWorkers is set to true the PodTemplateSpec antiAffinity rules are copied as is, otherwise merged with current restrictions. Prevent usage of deprecated rack.Zone (use topology.kubernetes.io/zone label instead), but allow removal of Zone.
 * [BUGFIX] [#410](https://github.com/k8ssandra/cass-operator/issues/410) Fix installation in IPv6 only environment
 * [BUGFIX] [#455](https://github.com/k8ssandra/cass-operator/issues/455) After task had completed, the running state would still say true
+* [BUGFIX] [#488](https://github.com/k8ssandra/cass-operator/issues/488) Expose the new metrics port in services
 
 ## v1.13.1
 

pkg/reconciliation/construct_service.go

@@ -6,6 +6,7 @@ package reconciliation
 // This file defines constructors for k8s service-related objects
 import (
 	"net"
+	"strings"
 
 	api "github.com/k8ssandra/cass-operator/apis/cassandra/v1beta1"
 	"github.com/k8ssandra/cass-operator/pkg/oplabels"
@@ -32,7 +33,12 @@ func newServiceForCassandraDatacenter(dc *api.CassandraDatacenter) *corev1.Servi
 		namedServicePort("tls-native", 9142, 9142),
 		namedServicePort("mgmt-api", 8080, 8080),
 		namedServicePort("prometheus", 9103, 9103),
-		namedServicePort("thrift", 9160, 9160),
+		namedServicePort("metrics", 9000, 9000),
+	}
+
+	if strings.HasPrefix(dc.Spec.ServerVersion, "3.") || dc.Spec.ServerType == "dse" {
+		ports = append(ports,
+			namedServicePort("thrift", 9160, 9160))
 	}
 
 	if dc.Spec.DseWorkloads != nil {
@@ -258,6 +264,9 @@ func newAllPodsServiceForCassandraDatacenter(dc *api.CassandraDatacenter) *corev
 		{
 			Name: "prometheus", Port: 9103, TargetPort: intstr.FromInt(9103),
 		},
+		{
+			Name: "metrics", Port: 9000, TargetPort: intstr.FromInt(9000),
+		},
 	}
 
 	addAdditionalOptions(service, &dc.Spec.AdditionalServiceConfig.AllPodsService)

pkg/reconciliation/construct_service_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/k8ssandra/cass-operator/apis/cassandra/v1beta1"
@@ -407,3 +408,99 @@ func TestAddingAdditionalLabels(t *testing.T) {
 		t.Errorf("service labels = %v, want %v", service.Labels, expected)
 	}
 }
+
+func TestServicePorts(t *testing.T) {
+	tests := []struct {
+		name                string
+		dc                  *api.CassandraDatacenter
+		dcServicePorts      []int32
+		allPodsServicePorts []int32
+	}{
+		{
+			name: "Cassandra 3.11.14",
+			dc: &api.CassandraDatacenter{
+				Spec: api.CassandraDatacenterSpec{
+					ClusterName:   "bob",
+					ServerType:    "cassandra",
+					ServerVersion: "3.11.14",
+				},
+			},
+			dcServicePorts:      []int32{8080, 9000, 9042, 9103, 9142, 9160},
+			allPodsServicePorts: []int32{8080, 9000, 9042, 9103},
+		},
+		{
+			name: "Cassandra 4.0.7",
+			dc: &api.CassandraDatacenter{
+				Spec: api.CassandraDatacenterSpec{
+					ClusterName:   "bob",
+					ServerType:    "cassandra",
+					ServerVersion: "4.0.7",
+				},
+			},
+			dcServicePorts:      []int32{8080, 9000, 9042, 9103, 9142},
+			allPodsServicePorts: []int32{8080, 9000, 9042, 9103},
+		},
+		{
+			name: "DSE 6.8.31",
+			dc: &api.CassandraDatacenter{
+				Spec: api.CassandraDatacenterSpec{
+					ClusterName:   "bob",
+					ServerType:    "dse",
+					ServerVersion: "6.8.31",
+				},
+			},
+			dcServicePorts:      []int32{8080, 9000, 9042, 9103, 9142, 9160},
+			allPodsServicePorts: []int32{8080, 9000, 9042, 9103},
+		},
+		{
+			name: "Cassandra 4.0.7 with custom ports",
+			dc: &api.CassandraDatacenter{
+				Spec: api.CassandraDatacenterSpec{
+					ClusterName:   "bob",
+					ServerType:    "cassandra",
+					ServerVersion: "4.0.7",
+					PodTemplateSpec: &corev1.PodTemplateSpec{
+						Spec: corev1.PodSpec{
+							Containers: []corev1.Container{
+								{
+									Name: "cassandra",
+									Ports: []corev1.ContainerPort{
+										{
+											Name:          "metrics",
+											ContainerPort: 9004,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			// FIXME: 9004 should be in the list of open ports
+			dcServicePorts:      []int32{8080, 9000, 9042, 9103, 9142},
+			allPodsServicePorts: []int32{8080, 9000, 9042, 9103},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			var getServicePorts = func(svc *corev1.Service) []int32 {
+				servicePorts := make([]int32, len(svc.Spec.Ports))
+				for i := 0; i < len(svc.Spec.Ports); i++ {
+					servicePorts[i] = svc.Spec.Ports[i].Port
+				}
+				return servicePorts
+			}
+			t.Run("dc service", func(t *testing.T) {
+				svc := newServiceForCassandraDatacenter(test.dc)
+				servicePorts := getServicePorts(svc)
+				assert.ElementsMatch(t, servicePorts, test.dcServicePorts)
+			})
+			t.Run("all pods service", func(t *testing.T) {
+				svc := newAllPodsServiceForCassandraDatacenter(test.dc)
+				servicePorts := getServicePorts(svc)
+				assert.ElementsMatch(t, servicePorts, test.allPodsServicePorts)
+			})
+		})
+	}
+}