Revert "[#778] Remove ping service"

rh-messaging · Jan 18, 2024 · 7677979 · 7677979
1 parent 30cdd2f
commit 7677979
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/controllers/activemqartemis_controller.go b/controllers/activemqartemis_controller.go
@@ -525,6 +525,7 @@ func MakeNamers(customResource *brokerv1beta1.ActiveMQArtemis) *common.Namers {
 		SsGlobalName:                  "",
 		SsNameBuilder:                 namer.NamerData{},
 		SvcHeadlessNameBuilder:        namer.NamerData{},
+		SvcPingNameBuilder:            namer.NamerData{},
 		PodsNameBuilder:               namer.NamerData{},
 		SecretsCredentialsNameBuilder: namer.NamerData{},
 		SecretsConsoleNameBuilder:     namer.NamerData{},
@@ -535,6 +536,7 @@ func MakeNamers(customResource *brokerv1beta1.ActiveMQArtemis) *common.Namers {
 	newNamers.SsNameBuilder.Base(customResource.Name).Suffix("ss").Generate()
 	newNamers.SsGlobalName = customResource.Name
 	newNamers.SvcHeadlessNameBuilder.Prefix(customResource.Name).Base("hdls").Suffix("svc").Generate()
+	newNamers.SvcPingNameBuilder.Prefix(customResource.Name).Base("ping").Suffix("svc").Generate()
 	newNamers.PodsNameBuilder.Base(customResource.Name).Suffix("container").Generate()
 	newNamers.SecretsCredentialsNameBuilder.Prefix(customResource.Name).Base("credentials").Suffix("secret").Generate()
 	if customResource.Spec.Console.SSLSecret != "" {

diff --git a/controllers/activemqartemis_reconciler.go b/controllers/activemqartemis_reconciler.go
@@ -252,6 +252,17 @@ func (reconciler *ActiveMQArtemisReconcilerImpl) ProcessStatefulSet(customResour
 	headlessServiceDefinition = svc.NewHeadlessServiceForCR2(client, headlesServiceName, ssNamespacedName.Namespace, serviceports.GetDefaultPorts(), labels, headlessServiceDefinition)
 	reconciler.trackDesired(headlessServiceDefinition)
 
+	if isClustered(customResource) {
+		pingServiceName := namer.SvcPingNameBuilder.Name()
+		var pingServiceDefinition *corev1.Service
+		obj = reconciler.cloneOfDeployed(reflect.TypeOf(corev1.Service{}), pingServiceName)
+		if obj != nil {
+			pingServiceDefinition = obj.(*corev1.Service)
+		}
+		pingServiceDefinition = svc.NewPingServiceDefinitionForCR2(client, pingServiceName, ssNamespacedName.Namespace, labels, labels, pingServiceDefinition)
+		reconciler.trackDesired(pingServiceDefinition)
+	}
+
 	if customResource.Spec.DeploymentPlan.RevisionHistoryLimit != nil {
 		currentStatefulSet.Spec.RevisionHistoryLimit = customResource.Spec.DeploymentPlan.RevisionHistoryLimit
 	}
@@ -421,7 +432,7 @@ func (r *ActiveMQArtemisReconcilerImpl) syncMessageMigration(customResource *bro
 	ssNames["CLUSTERUSER"] = environments.GLOBAL_AMQ_CLUSTER_USER
 	ssNames["CLUSTERPASS"] = environments.GLOBAL_AMQ_CLUSTER_PASSWORD
 	ssNames["HEADLESSSVCNAMEVALUE"] = namer.SvcHeadlessNameBuilder.Name()
-	ssNames["PINGSVCNAMEVALUE"] = namer.SvcHeadlessNameBuilder.Name()
+	ssNames["PINGSVCNAMEVALUE"] = namer.SvcPingNameBuilder.Name()
 	ssNames["SERVICE_ACCOUNT"] = os.Getenv("SERVICE_ACCOUNT")
 	ssNames["SERVICE_ACCOUNT_NAME"] = os.Getenv("SERVICE_ACCOUNT")
 	ssNames["AMQ_CREDENTIALS_SECRET_NAME"] = namer.SecretsCredentialsNameBuilder.Name()
@@ -2517,7 +2528,7 @@ func MakeEnvVarArrayForCR(customResource *brokerv1beta1.ActiveMQArtemis, namer c
 	}
 
 	envVar := []corev1.EnvVar{}
-	envVarArrayForBasic := environments.AddEnvVarForBasic(requireLogin, journalType, namer.SvcHeadlessNameBuilder.Name())
+	envVarArrayForBasic := environments.AddEnvVarForBasic(requireLogin, journalType, namer.SvcPingNameBuilder.Name())
 	envVar = append(envVar, envVarArrayForBasic...)
 	if customResource.Spec.DeploymentPlan.PersistenceEnabled {
 		envVarArrayForPresistent := environments.AddEnvVarForPersistent(customResource.Name)

diff --git a/pkg/resources/environments/environment.go b/pkg/resources/environments/environment.go
@@ -112,6 +112,11 @@ func AddEnvVarForBasic(requireLogin string, journalType string, svcPingName stri
 			Value:     svcPingName,
 			ValueFrom: nil,
 		},
+		{
+			Name:      "OPENSHIFT_DNS_PING_SERVICE_PORT",
+			Value:     "7800",
+			ValueFrom: nil,
+		},
 	}
 
 	return envVarArray

diff --git a/pkg/resources/services/service.go b/pkg/resources/services/service.go
@@ -70,3 +70,38 @@ func NewServiceDefinitionForCR(svcName types.NamespacedName, client client.Clien
 
 	return svc
 }
+
+func NewPingServiceDefinitionForCR2(client client.Client, serviceName string, namespace string, labels map[string]string, selectorLabels map[string]string, svc *corev1.Service) *corev1.Service {
+
+	if svc == nil {
+		svc = &corev1.Service{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "v1",
+				Kind:       "Service",
+			},
+			ObjectMeta: metav1.ObjectMeta{},
+			Spec:       corev1.ServiceSpec{},
+		}
+	}
+
+	port := corev1.ServicePort{
+		Protocol:   "TCP",
+		Port:       8888,
+		TargetPort: intstr.FromInt(int(8888)),
+	}
+	ports := []corev1.ServicePort{}
+	ports = append(ports, port)
+
+	// apply desired
+	svc.ObjectMeta.Labels = labels
+	svc.ObjectMeta.Name = serviceName
+	svc.ObjectMeta.Namespace = namespace
+
+	svc.Spec.Type = "ClusterIP"
+	svc.Spec.Ports = ports
+	svc.Spec.Selector = selectorLabels
+	svc.Spec.ClusterIP = "None"
+	svc.Spec.PublishNotReadyAddresses = true
+
+	return svc
+}
diff --git a/pkg/utils/common/common.go b/pkg/utils/common/common.go
@@ -65,6 +65,7 @@ type Namers struct {
 	SsGlobalName                  string
 	SsNameBuilder                 namer.NamerData
 	SvcHeadlessNameBuilder        namer.NamerData
+	SvcPingNameBuilder            namer.NamerData
 	PodsNameBuilder               namer.NamerData
 	SecretsCredentialsNameBuilder namer.NamerData
 	SecretsConsoleNameBuilder     namer.NamerData