Allow image CLI JVM options to be specified via Infinispan CR #1643

infinispan · Jul 25, 2022 · a3fdbb5 · a3fdbb5
1 parent ed21bcd
commit a3fdbb5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 1 deletion.
diff --git a/api/v1/infinispan_types.go b/api/v1/infinispan_types.go
@@ -139,6 +139,8 @@ type InfinispanServiceSpec struct {
 
 // InfinispanContainerSpec specify resource requirements per container
 type InfinispanContainerSpec struct {
+	// +optional
+	CliExtraJvmOpts string `json:"cliExtraJvmOpts,omitempty"`
 	// +optional
 	ExtraJvmOpts string `json:"extraJvmOpts,omitempty"`
 	// +optional

diff --git a/config/crd/bases/infinispan.org_backups.yaml b/config/crd/bases/infinispan.org_backups.yaml
@@ -43,6 +43,8 @@ spec:
                 description: InfinispanContainerSpec specify resource requirements
                   per container
                 properties:
+                  cliExtraJvmOpts:
+                    type: string
                   cpu:
                     type: string
                   extraJvmOpts:

diff --git a/config/crd/bases/infinispan.org_infinispans.yaml b/config/crd/bases/infinispan.org_infinispans.yaml
@@ -681,6 +681,8 @@ spec:
                 description: InfinispanContainerSpec specify resource requirements
                   per container
                 properties:
+                  cliExtraJvmOpts:
+                    type: string
                   cpu:
                     type: string
                   extraJvmOpts:

diff --git a/config/crd/bases/infinispan.org_restores.yaml b/config/crd/bases/infinispan.org_restores.yaml
@@ -46,6 +46,8 @@ spec:
                 description: InfinispanContainerSpec specify resource requirements
                   per container
                 properties:
+                  cliExtraJvmOpts:
+                    type: string
                   cpu:
                     type: string
                   extraJvmOpts:

diff --git a/controllers/infinispan_controller.go b/controllers/infinispan_controller.go
@@ -1504,6 +1504,9 @@ func (r *infinispanRequest) reconcileContainerConf(statefulSet *appsv1.StatefulS
 		updateStatefulSetEnv(statefulSet, "JAVA_OPTIONS", ispn.GetJavaOptions())
 		updateNeeded = true
 	}
+	if updateStatefulSetEnv(statefulSet, "CLI_JAVA_OPTIONS", ispnContr.CliExtraJvmOpts) {
+		updateNeeded = true
+	}
 
 	if updateNeeded {
 		r.reqLogger.Info("updateNeeded")

diff --git a/controllers/pods.go b/controllers/pods.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-
 	"strconv"
 	"strings"
 
@@ -123,6 +122,7 @@ func PodEnv(i *infinispanv1.Infinispan, systemEnv *[]corev1.EnvVar) []corev1.Env
 		{Name: "MANAGED_ENV", Value: "TRUE"},
 		{Name: "JAVA_OPTIONS", Value: i.GetJavaOptions()},
 		{Name: "EXTRA_JAVA_OPTIONS", Value: i.Spec.Container.ExtraJvmOpts},
+		{Name: "CLI_JAVA_OPTIONS", Value: i.Spec.Container.CliExtraJvmOpts},
 		{Name: "DEFAULT_IMAGE", Value: consts.DefaultImageName},
 	}