Removed javaOptions and volumes

scc-digitalhub · Dec 11, 2023 · b480dc8 · b480dc8
1 parent 27dc93d
commit b480dc8
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ kubectl apply -f config/samples/operator_v1_dremiorestserver.yaml
 The custom resource's properties are:
 
 - `tables`: **Required**. Comma-separated list of tables to expose
-- `javaOptions`: *Optional*. Corresponds to *JAVA_TOOL_OPTIONS*: on JDK 9+, `--add-opens=java.base/java.nio=ALL-UNNAMED` is required
 - `connection`:
   - `host`: **Required**.
   - `port`: *Optional*.
@@ -34,7 +33,6 @@ A valid sample spec configuration is:
 ``` yaml
 ...
 spec:
-  javaOptions: --add-opens=java.base/java.nio=ALL-UNNAMED
   tables: postgres.myschema.mytable
   connection:
     host: 192.168.123.123
@@ -46,7 +44,6 @@ Another valid sample:
 ``` yaml
 ...
 spec:
-  javaOptions: --add-opens=java.base/java.nio=ALL-UNNAMED
   tables: postgres.myschema.mytable
   connection:
     host: 192.168.123.123

diff --git a/api/v1/dremiorestserver_types.go b/api/v1/dremiorestserver_types.go
@@ -25,10 +25,6 @@ import (
 
 // Dremio REST Server properties
 type DremioRestServerSpec struct {
-	// Corresponds to JAVA_TOOL_OPTIONS: on JDK 9+, --add-opens=java.base/java.nio=ALL-UNNAMED is required
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	JavaOptions string `json:"javaOptions,omitempty"` // JAVA_TOOL_OPTIONS
-
 	// Comma-separated list of tables to expose
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	Tables string `json:"tables,omitempty"` // DREMIO_TABLES (comma-separated)

diff --git a/config/crd/bases/operator.dremiorestserver.com_dremiorestservers.yaml b/config/crd/bases/operator.dremiorestserver.com_dremiorestservers.yaml
@@ -56,10 +56,6 @@ spec:
                   user:
                     type: string
                 type: object
-              javaOptions:
-                description: 'Corresponds to JAVA_TOOL_OPTIONS: on JDK 9+, --add-opens=java.base/java.nio=ALL-UNNAMED
-                  is required'
-                type: string
               tables:
                 description: Comma-separated list of tables to expose
                 type: string

diff --git a/config/samples/operator_v1_dremiorestserver.yaml b/config/samples/operator_v1_dremiorestserver.yaml
@@ -4,7 +4,6 @@ metadata:
   name: drs
   namespace: dremio-rest-server-operator-system
 spec:
-  javaOptions: --add-opens=java.base/java.nio=ALL-UNNAMED -Djava.io.tmpdir=/tmp/tomcat -Dserver.tomcat.access-log-enabled=false
   tables: postgres.instagram.utenti
   connection:
     host: 192.168.178.120

diff --git a/deployment.yaml b/deployment.yaml
@@ -68,10 +68,6 @@ spec:
                   user:
                     type: string
                 type: object
-              javaOptions:
-                description: 'Corresponds to JAVA_TOOL_OPTIONS: on JDK 9+, --add-opens=java.base/java.nio=ALL-UNNAMED
-                  is required'
-                type: string
               tables:
                 description: Comma-separated list of tables to expose
                 type: string

diff --git a/internal/controller/dremiorestserver_controller.go b/internal/controller/dremiorestserver_controller.go
@@ -367,12 +367,6 @@ func crUpdated(dep *appsv1.Deployment, cr *operatorv1.DremioRestServer, newDremi
 
 	// Check if CR spec (JavaOptions, Tables) has been modified
 	for _, env := range dep.Spec.Template.Spec.Containers[0].Env {
-		if env.Name == "JAVA_TOOL_OPTIONS" {
-			// Compare with current JavaOptions
-			if cr.Spec.JavaOptions != env.Value {
-				return true
-			}
-		}
 		if env.Name == "DREMIO_TABLES" {
 			// Compare with current Tables
 			if cr.Spec.Tables != env.Value {
@@ -400,8 +394,6 @@ func (r *DremioRestServerReconciler) deploymentForDremiorestserver(
 		return nil, errors.New("tables missing from spec")
 	}
 
-	emptyDirSize := resource.MustParse("10Mi")
-
 	ls := labelsForDremioRestServer(dremiorestserver.Name, tag)
 	selectors := selectorsForDremioRestServer(dremiorestserver.Name)
 
@@ -457,26 +449,10 @@ func (r *DremioRestServerReconciler) deploymentForDremiorestserver(
 							Type: corev1.SeccompProfileTypeRuntimeDefault,
 						},
 					},
-					Volumes: []corev1.Volume{
-						{
-							Name: "tomcat-tmp",
-							VolumeSource: corev1.VolumeSource{
-								EmptyDir: &corev1.EmptyDirVolumeSource{
-									SizeLimit: &emptyDirSize,
-								},
-							},
-						},
-					},
 					Containers: []corev1.Container{{
 						Image:           strings.Join([]string{image, tag}, ":"),
 						Name:            "dremiorestserver",
 						ImagePullPolicy: corev1.PullIfNotPresent,
-						VolumeMounts: []corev1.VolumeMount{
-							{
-								MountPath: "/tmp/tomcat",
-								Name:      "tomcat-tmp",
-							},
-						},
 						Resources: corev1.ResourceRequirements{
 							Limits:   getLimits(),
 							Requests: getRequests(),
@@ -490,13 +466,8 @@ func (r *DremioRestServerReconciler) deploymentForDremiorestserver(
 									"ALL",
 								},
 							},
-							ReadOnlyRootFilesystem: &[]bool{true}[0],
 						},
 						Env: []corev1.EnvVar{
-							{
-								Name:  "JAVA_TOOL_OPTIONS",
-								Value: dremiorestserver.Spec.JavaOptions,
-							},
 							{
 								Name: "DREMIO_URL",
 								ValueFrom: &corev1.EnvVarSource{
@@ -680,7 +651,6 @@ func selectorsForDremioRestServer(name string) map[string]string {
 // SetupWithManager sets up the controller with the Manager.
 // Note that the Deployment will be also watched in order to ensure its
 // desirable state on the cluster
-// TODO add Owns to other resources?
 func (r *DremioRestServerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&operatorv1.DremioRestServer{}).