move setting back and clean up testing

rda-tds-helm/templates/deployment.yaml

@@ -35,26 +35,6 @@ spec:
         - name: {{ .Values.webapp.volume.fs.name }}
           persistentVolumeClaim:
             claimName: {{ .Values.webapp.volume.fs.name }}
-      # # Use an initContainer to copy the thredds content from the image to the PVC on startup, ensuring it is refreshed on every pod restart      
-      # initContainers:
-      #   - name: copy-thredds-content
-      #     image: {{ .Values.webapp.container.image }}
-      #     command: ["sh", "-c", "cp -rf /usr/local/tomcat/content/thredds/. /mnt/thredds-content/"]
-      #     volumeMounts:
-      #     - mountPath: /mnt/thredds-content
-      #       name: {{ .Values.webapp.volume.fs.name }}
-      #       subPath: thredds-content
-      # # Changing the owner of PVC root dir to the same user as the container to allow TDS to write cache and log files to the PVC. 
-      # # This is required because the PVC is mounted with root ownership by default, and TDS needs write permissions to the 
-      # # mounted PVC for TDM to create index file. 
-      # # The initContainer runs a chown command to change the ownership of the mounted PVC directory 
-      # initContainers:
-      #   - name: fix-pvc-permissions
-      #     image: busybox
-      #     command: ["sh", "-c", "chown ubuntu:ubuntu /data/TDSIndexFiles/data/rda/data"]
-      #     volumeMounts:
-      #     - mountPath: /data/TDSIndexFiles/data/rda/data
-      #       name: {{ .Values.webapp.volume.fs.name }}
       containers:
       # tds container
       - name: {{ .Values.webapp.name }}
@@ -71,8 +51,8 @@ spec:
             value: {{ .Values.webapp.container.env.THREDDS_XMX_SIZE }}
           - name: THREDDS_XMS_SIZE
             value: {{ .Values.webapp.container.env.THREDDS_XMS_SIZE }}
-          - name: JAVA_OPTS # Redirect OOM heap dump off ephemeral storage; exit fast on OOM so pod restarts
-            value: "-XX:HeapDumpPath=/usr/local/tomcat/temp/ -XX:+ExitOnOutOfMemoryError -Ddap4.maxDataLimit=500 -Ddap4.maxRequestSize=1000"
+          - name: JAVA_OPTS # Redirect OOM heap dump off ephemeral storage; exit fast on OOM so pod restarts : temp remove. -XX:+ExitOnOutOfMemoryError
+            value: "-XX:HeapDumpPath=/usr/local/tomcat/temp/"
           - name: K8S_POD_NAME # Inject the current pod's name into the container environment so that server.xml can use it for access log naming
             valueFrom:
               fieldRef:

rda-tds-helm/values.yaml

@@ -22,8 +22,8 @@ webapp:
     ephemeralStorageLimit: 5Gi
     responseTimeout: 180
     maxUploadSize: 30m
-    limit_connections: 100  # Increased for concurrent requests
-    limit_rps: 10          # Increased for page load bursts
+    limit_connections: 100  # Increased for concurrent requests - global limit
+    limit_rps: 10          # Increased for page load bursts - global limit
 
     env:
       THREDDS_XMX_SIZE: 32G

rda-tds/Dockerfile-tdm

@@ -1,7 +1,6 @@
 # running under user Ubuntu not root!!! 
 # Make sure the mount path is also owned by the same user
 FROM unidata/tdm-docker:5.6
-USER root
 COPY ./content/ /usr/local/tomcat/content/tdm/thredds/