[#1086] use cr.name as broker name in restricted mode

arkmq-org · Jan 23, 2025 · fc30ea0 · fc30ea0
1 parent 83f68cc
commit fc30ea0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/controllers/activemqartemis_reconciler.go b/controllers/activemqartemis_reconciler.go
@@ -2036,7 +2036,7 @@ func (reconciler *ActiveMQArtemisReconcilerImpl) PodTemplateSpecForCR(customReso
 		brokerPropertiesMapData["_cert-roles"] = cert_roles.String()
 
 		foundationalProps := newPropsWithHeader()
-		fmt.Fprintln(foundationalProps, "name=amq-broker")
+		fmt.Fprintf(foundationalProps, "name=%s\n", customResource.Name)
 		fmt.Fprintln(foundationalProps, "criticalAnalyzer=false")
 		fmt.Fprintln(foundationalProps, "journalDirectory=/app/data")
 		fmt.Fprintln(foundationalProps, "bindingsDirectory=/app/data/bindings")

diff --git a/pkg/utils/artemis/artemis.go b/pkg/utils/artemis/artemis.go
@@ -49,11 +49,11 @@ type Artemis struct {
 	jolokia     jolokia.IJolokia
 }
 
-func GetArtemisAgentForRestricted(client rtclient.Client, ordinalFqdn string) *Artemis {
+func GetArtemisAgentForRestricted(client rtclient.Client, brokerName string, ordinalFqdn string) *Artemis {
 	artemis := Artemis{
 		ip:          ordinalFqdn,
 		jolokiaPort: jolokia.JOLOKIA_AGENT_PORT,
-		name:        "amq-broker",
+		name:        brokerName,
 		jolokia:     jolokia.GetRestrictedJolokia(client, ordinalFqdn, jolokia.JOLOKIA_AGENT_PORT, "/jolokia"),
 	}
 	return &artemis

diff --git a/pkg/utils/jolokia_client/jolokia_client.go b/pkg/utils/jolokia_client/jolokia_client.go
@@ -69,7 +69,7 @@ func GetMinimalJolokiaAgents(cr *v1beta1.ActiveMQArtemis, client rtclient.Client
 
 		ordinalFqdn := common.OrdinalFQDNS(cr.Name, cr.Namespace, i)
 
-		artemis := mgmt.GetArtemisAgentForRestricted(client, ordinalFqdn)
+		artemis := mgmt.GetArtemisAgentForRestricted(client, cr.Name, ordinalFqdn)
 
 		jkInfo := JkInfo{
 			Artemis: artemis,