Merge pull request #148 from AKamyshnikova/logLevelFix

Fix logLevel check in chart
cscetbon · Jun 10, 2024 · e0b5b3c · e0b5b3c
2 parents edcceb3 + 366d855
commit e0b5b3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/charts/casskop/templates/deployment.yaml b/charts/casskop/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
 {{- end }}
       securityContext:
         runAsUser: 1000
-{{- if .Values.debug.enabled }}
+{{- if eq .Values.logLevel "DEBUG" }}
       shareProcessNamespace: true
 {{- end }}
       containers:

diff --git a/charts/multi-casskop/templates/deployment.yaml b/charts/multi-casskop/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
 {{- end }}
       securityContext:
         runAsUser: 1000
-{{- if .Values.debug.enabled }}
+{{- if eq .Values.logLevel "DEBUG" }}
       shareProcessNamespace: true
 {{- end }}
       containers:

diff --git a/controllers/cassandracluster/generator.go b/controllers/cassandracluster/generator.go
@@ -925,6 +925,12 @@ func createCassandraContainer(cc *api.CassandraCluster, status *api.CassandraClu
 	} else {
 		command = []string{"cassandra", "-f"}
 	}
+	cassandraEnv := commonBootstrapCassandraEnvVar(cc)
+	// This option required for nodetool correct execution
+	cassandraEnv = append(cassandraEnv, v1.EnvVar{
+		Name:  "JAVA_TOOL_OPTIONS",
+		Value: "-Dcom.sun.jndi.rmiURLParsing=legacy",
+	})
 
 	cassandraContainer := v1.Container{
 		Name:            cassandraContainerName,
@@ -973,7 +979,7 @@ func createCassandraContainer(cc *api.CassandraCluster, status *api.CassandraClu
 			ProcMount:              func(s v1.ProcMountType) *v1.ProcMountType { return &s }(v1.DefaultProcMount),
 			ReadOnlyRootFilesystem: cc.Spec.ReadOnlyRootFilesystem,
 		},
-		Env: commonBootstrapCassandraEnvVar(cc),
+		Env: cassandraEnv,
 		ReadinessProbe: &v1.Probe{
 			InitialDelaySeconds: *cc.Spec.ReadinessInitialDelaySeconds,
 			TimeoutSeconds:      *cc.Spec.ReadinessHealthCheckTimeout,