update

ts4nfdi · Dec 13, 2024 · aafaf2d · aafaf2d
1 parent a54dfe9
commit aafaf2d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 22 deletions.
diff --git a/k8s/dataserver/Chart.yaml b/k8s/dataserver/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "1.0.0"
 description: A Helm chart to deploy the ols4 dataserver
 name: ols4-dataserver
-version: 0.1.3
+version: 0.1.4
diff --git a/k8s/dataserver/templates/ols4-dataserver-deployment.yaml b/k8s/dataserver/templates/ols4-dataserver-deployment.yaml
@@ -28,11 +28,6 @@ spec:
             limits:
               memory: 4Gi
       volumes:
-        - name: {{.Release.Name}}-data
-          ephemeral:
-            volumeClaimTemplate:
-              spec:
-                accessModes: [ "ReadWriteMany" ]
-                resources:
-                  requests:
-                    storage: 50Gi
+      - name: {{.Release.Name}}-data
+        persistentVolumeClaim:
+          claimName: {{.Release.Name}}-pvc
diff --git a/k8s/ols4-backend/Chart.yaml b/k8s/ols4-backend/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "1.0.0"
 description: A Helm chart to deploy the ols4 backend
 name: ols4-backend
-version: 0.1.7
+version: 0.1.8
diff --git a/k8s/ols4-backend/templates/ols4-backend-deployment.yaml b/k8s/ols4-backend/templates/ols4-backend-deployment.yaml
@@ -20,11 +20,6 @@ spec:
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
-          resources:
-            requests:
-              memory: 5000Mi
-            limits:
-              memory: 5000Mi
           env:
             - name: OLS_SOLR_HOST
               value: http://{{ .Release.Name }}-solr:8983

diff --git a/k8s/ols4-backend/templates/ols4-ingress.yaml b/k8s/ols4-backend/templates/ols4-ingress.yaml
@@ -5,14 +5,14 @@ kind: Ingress
 metadata:
   name: {{ .Release.Name }}-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     {{ if .Values.ingress.enableSSL }}
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     cert-manager.io/issuer: {{ .Values.ingress.certIssuer | quote}}
     {{ end }}
     nginx.ingress.kubernetes.io/proxy-buffer-size: 12k
 spec:
+  ingressClassName: "nginx"
   {{ if .Values.ingress.enableSSL }}
   tls:
     - hosts:
@@ -23,7 +23,7 @@ spec:
     - host: {{ .Values.ingress.dns }}
       http:
         paths:
-        - path: /
+        - path: {{ .Values.ingress.path }}
           pathType: Prefix
           backend:
             service:

diff --git a/k8s/ols4-backend/templates/ols4-solr-deployment.yaml b/k8s/ols4-backend/templates/ols4-solr-deployment.yaml
@@ -28,11 +28,6 @@ spec:
               name: {{ .Release.Name }}-solr-storage
           command: ["/bin/bash", "-c"]
           args: ["echo Downloading data && rm -rf /data/solr && mkdir /data/solr && wget $SOLR_TARBALL_URL -O /data/tmp.tgz && echo unzip && tar -zxf /data/tmp.tgz --directory /data --no-same-owner --no-overwrite-dir && echo Starting solr && solr-foreground -a -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put"]
-          resources:
-            requests:
-              memory: 2000Mi
-            limits:
-              memory: 2000Mi
           env:
             - name: SOLR_TARBALL_URL
               value: {{.Values.solrTarballUrl}}

diff --git a/k8s/ols4-backend/values.yaml b/k8s/ols4-backend/values.yaml
@@ -2,6 +2,7 @@ ingress:
   dns:
   enableSSL:
   certIssuer:
+  path:
 oidc:
   data:
     host:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ ingress: @@
       dns:
       enableSSL:
       certIssuer:
+      path:
     oidc:
       data:
         host:
@@ Expand Down @@