Merge pull request #164 from gzimin/dev

Fix issues with JMX configuration
cscetbon · Feb 4, 2025 · e3587af · e3587af
2 parents 0747760 + 09921a6
commit e3587af
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 23 deletions.
diff --git a/api/v2/cassandracluster_types.go b/api/v2/cassandracluster_types.go
@@ -822,14 +822,16 @@ type CassandraClusterSpec struct {
 
 // JMXConfiguration defines Cassandra JMX variables configuration
 type JMXConfiguration struct {
-	// Flag to tell that JMX remote is enabled
-	// +kubebuilder:default:=false
-	JMXRemote bool `json:"jmxRemoteEnable,omitempty"`
-	// JMX Remote port number
-	// +kubebuilder:default:=7199
-	JMXRemotePort         int  `json:"jmxRemotePort,omitempty"`
-	JXMRemoteSSL          bool `json:"jmxRemoteSSL,omitempty"`
-	JMXRemoteAuthenticate bool `json:"jmxRemoteAuthenticate,omitempty"`
+	// JMXRemote defines is JMX remote enabled
+	JMXRemote *bool `json:"jmxRemoteEnable,omitempty"`
+	// JMXRemotePort defines port that the JMX agent will use to listen for incoming JMX connections
+	JMXRemotePort int `json:"jmxRemotePort,omitempty"`
+	// JXMRemoteRmiPort defines Remote Method Invocation port for the JMX connection
+	JMXRemoteRmiPort int `json:"jmxRemoteRmiPort,omitempty"`
+	// JXMRemoteSSL defines is SSL for JMX connections enabled or not
+	JXMRemoteSSL *bool `json:"jmxRemoteSSL,omitempty"`
+	// JMXRemoteAuthenticate defines authentication for JMX remote connections
+	JMXRemoteAuthenticate *bool `json:"jmxRemoteAuthenticate,omitempty"`
 }
 
 // StorageConfig defines additional storage configurations

diff --git a/api/v2/zz_generated.deepcopy.go b/api/v2/zz_generated.deepcopy.go
diff --git a/charts/casskop/crds/db.orange.com_cassandraclusters.yaml b/charts/casskop/crds/db.orange.com_cassandraclusters.yaml
@@ -236,6 +236,25 @@ spec:
                 imagepullpolicy:
                   description: ImagePullPolicy define the pull policy for C* docker image
                   type: string
+                jmxConfiguration:
+                  description: JMXConfiguration defines Cassandra JMX variables configuration
+                  type: object
+                  properties:
+                    jmxRemoteAuthenticate:
+                      description: JMXRemoteAuthenticate defines authentication for JMX remote connections
+                      type: boolean
+                    jmxRemoteEnable:
+                      description: JMXRemote defines is JMX remote enabled
+                      type: boolean
+                    jmxRemotePort:
+                      description: JMXRemotePort defines port that the JMX agent will use to listen for incoming JMX connections
+                      type: integer
+                    jmxRemoteRmiPort:
+                      description: JXMRemoteRmiPort defines Remote Method Invocation port for the JMX connection
+                      type: integer
+                    jmxRemoteSSL:
+                      description: JXMRemoteSSL defines is SSL for JMX connections enabled or not
+                      type: boolean
                 keyspaceCleanupThreads:
                   description: |-
                     Number of jobs (threads) for keyspace cleanup command.

diff --git a/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml b/charts/multi-casskop/crds/db.orange.com_cassandraclusters.yaml
@@ -236,6 +236,25 @@ spec:
                 imagepullpolicy:
                   description: ImagePullPolicy define the pull policy for C* docker image
                   type: string
+                jmxConfiguration:
+                  description: JMXConfiguration defines Cassandra JMX variables configuration
+                  type: object
+                  properties:
+                    jmxRemoteAuthenticate:
+                      description: JMXRemoteAuthenticate defines authentication for JMX remote connections
+                      type: boolean
+                    jmxRemoteEnable:
+                      description: JMXRemote defines is JMX remote enabled
+                      type: boolean
+                    jmxRemotePort:
+                      description: JMXRemotePort defines port that the JMX agent will use to listen for incoming JMX connections
+                      type: integer
+                    jmxRemoteRmiPort:
+                      description: JXMRemoteRmiPort defines Remote Method Invocation port for the JMX connection
+                      type: integer
+                    jmxRemoteSSL:
+                      description: JXMRemoteSSL defines is SSL for JMX connections enabled or not
+                      type: boolean
                 keyspaceCleanupThreads:
                   description: |-
                     Number of jobs (threads) for keyspace cleanup command.

diff --git a/config/crd/bases/db.orange.com_cassandraclusters.yaml b/config/crd/bases/db.orange.com_cassandraclusters.yaml
@@ -241,16 +241,19 @@ spec:
                   type: object
                   properties:
                     jmxRemoteAuthenticate:
+                      description: JMXRemoteAuthenticate defines authentication for JMX remote connections
                       type: boolean
                     jmxRemoteEnable:
-                      description: Flag to tell that JMX remote is enabled
+                      description: JMXRemote defines is JMX remote enabled
                       type: boolean
-                      default: false
                     jmxRemotePort:
-                      description: JMX Remote port number
+                      description: JMXRemotePort defines port that the JMX agent will use to listen for incoming JMX connections
+                      type: integer
+                    jmxRemoteRmiPort:
+                      description: JXMRemoteRmiPort defines Remote Method Invocation port for the JMX connection
                       type: integer
-                      default: 7199
                     jmxRemoteSSL:
+                      description: JXMRemoteSSL defines is SSL for JMX connections enabled or not
                       type: boolean
                 keyspaceCleanupThreads:
                   description: |-

diff --git a/controllers/cassandracluster/generator.go b/controllers/cassandracluster/generator.go
@@ -17,8 +17,6 @@ package cassandracluster
 import (
 	"encoding/json"
 	"fmt"
-	"reflect"
-
 	"github.com/Jeffail/gabs"
 	"github.com/banzaicloud/k8s-objectmatcher/patch"
 
@@ -83,6 +81,7 @@ const (
 var JMXConfigurationMap = map[string]string{
 	"JMXRemote":             "-Dcom.sun.management.jmxremote=",
 	"JMXRemotePort":         "-Dcom.sun.management.jmxremote.port=",
+	"JMXRemoteRmiPort":      "-Dcom.sun.management.jmxremote.rmi.port=",
 	"JXMRemoteSSL":          "-Dcom.sun.management.jmxremote.ssl=",
 	"JMXRemoteAuthenticate": "-Dcom.sun.management.jmxremote.authenticate=",
 }
@@ -307,13 +306,20 @@ func generateVolumeClaimTemplate(cc *api.CassandraCluster, labels map[string]str
 func generateJMXConfiguration(jmxConf api.JMXConfiguration) v1.EnvVar {
 	var jmxEnvVar v1.EnvVar
 	var jmxParam string
-	values := reflect.ValueOf(jmxConf)
-	types := reflect.TypeOf(jmxConf)
-	for i := 0; i < values.NumField(); i++ {
-		fieldName := types.Field(i).Name
-		fieldValue := values.Field(i).Interface()
-		param := JMXConfigurationMap[fieldName] + fmt.Sprintf("%v", fieldValue) + " "
-		jmxParam += param
+	if jmxConf.JMXRemote != nil {
+		jmxParam += JMXConfigurationMap["JMXRemote"] + strconv.FormatBool(*jmxConf.JMXRemote) + " "
+	}
+	if jmxConf.JXMRemoteSSL != nil {
+		jmxParam += JMXConfigurationMap["JXMRemoteSSL"] + strconv.FormatBool(*jmxConf.JXMRemoteSSL) + " "
+	}
+	if jmxConf.JMXRemoteAuthenticate != nil {
+		jmxParam += JMXConfigurationMap["JMXRemoteAuthenticate"] + strconv.FormatBool(*jmxConf.JMXRemoteAuthenticate) + " "
+	}
+	if jmxConf.JMXRemotePort != 0 {
+		jmxParam += JMXConfigurationMap["JMXRemotePort"] + strconv.Itoa(jmxConf.JMXRemotePort) + " "
+	}
+	if jmxConf.JMXRemoteRmiPort != 0 {
+		jmxParam += JMXConfigurationMap["JMXRemoteRmiPort"] + strconv.Itoa(jmxConf.JMXRemoteRmiPort) + " "
 	}
 	jmxEnvVar = v1.EnvVar{Name: jvmOptsName, Value: jmxParam}
 	return jmxEnvVar
@@ -960,7 +966,9 @@ func createCassandraContainer(cc *api.CassandraCluster, status *api.CassandraClu
 
 	if cc.Spec.JMXConfiguration != nil {
 		jmxEnvVariable := generateJMXConfiguration(*cc.Spec.JMXConfiguration)
-		cassandraEnv = append(cassandraEnv, jmxEnvVariable)
+		if jmxEnvVariable.Value != "" {
+			cassandraEnv = append(cassandraEnv, jmxEnvVariable)
+		}
 	}
 	cassandraContainer := v1.Container{
 		Name:            cassandraContainerName,

diff --git a/controllers/cassandracluster/testdata/cassandracluster-2DC.yaml b/controllers/cassandracluster/testdata/cassandracluster-2DC.yaml
@@ -34,6 +34,7 @@ spec:
   jmxConfiguration:
     jmxRemoteEnable: false
     jmxRemotePort: 7199
+    jmxRemoteRmiPort: 7199
     jmxRemoteSSL: false
     jmxRemoteAuthenticate: false
   imagePullSecret: