From 4a4ce064d3f5a45ba817f018451c456ec31dd4d0 Mon Sep 17 00:00:00 2001
From: sasse <sasse@zbmed.de>
Date: Tue, 18 Jun 2024 16:30:46 +0200
Subject: [PATCH] fix values and update readme

---
 README.md                                          | 14 ++++++++------
 k8s/ols4-backend/Chart.yaml                        |  2 +-
 k8s/ols4-backend/README.md                         | 10 +++++-----
 .../templates/ols4-neo4j-deployment.yaml           |  4 ++--
 .../templates/ols4-solr-deployment.yaml            |  4 ++--
 k8s/ols4-backend/values.yaml                       |  8 ++++----
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index cb01dea..bf8e62b 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ sudo chown -R username:username /solr.tgz
 
 ### Deploy ols4-dataserver
 ```bash
-helm repo add semlookp-deployment https://zbmed.github.io/semlookp-deployment/
-helm install ols4-dataserver semlookp-deployment/ols4-dataserver
+helm repo add semlookp-deployment https://ts4nfdi.github.io/ols4-backend-deployment/
+helm install ols4-dataserver ols4-backend-deployment/ols4-dataserver
 ```
 
 ### Upload data to ols4-dataserver
@@ -48,9 +48,11 @@ kubectl cp /solr-meshd-v1.tgz ols4-dataserver-7d9d88cd86-n98fb:/usr/share/nginx/
 ```bash
 helm install <your release name> \
 --set-json='ingress.dns="<your domain>"'  \
---set-json='imageTag="dev"'  \
+--set-json='backend.backendImage="ghcr.io/ebispot/ols4-backend:stable"'  \
+--set-json='solrImage="ghcr.io/ebispot/ols4-solr:9.0.0"'  \
+--set-json='neo4jImage="ghcr.io/ebispot/ols4-neo4j:4.4.9-community"'  \
 --set-json='backend.context="/ols4"'  \
---set-json='backend.neo4jTarballUrl="http://ols4-dataserver/neo4j.tgz"'  \
---set-json='backend.solrTarballUrl="http://ols4-dataserver/solr.tgz"'  \
-semlookp-deployment/k8s/ols4-backend
+--set-json='neo4jTarballUrl="http://ols4-dataserver/neo4j-nfdi4health.tgz"'  \
+--set-json='solrTarballUrl="http://ols4-dataserver/solr-nfdi4health.tgz"'  \
+ols4-backend-deployment/ols4-backend
 ```
\ No newline at end of file
diff --git a/k8s/ols4-backend/Chart.yaml b/k8s/ols4-backend/Chart.yaml
index 0eac1be..97dda68 100644
--- 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.6
+version: 0.1.7
diff --git a/k8s/ols4-backend/README.md b/k8s/ols4-backend/README.md
index 84488b0..49a8322 100644
--- a/k8s/ols4-backend/README.md
+++ b/k8s/ols4-backend/README.md
@@ -5,10 +5,10 @@
 helm install ols4 \
 --set-json='ingress.dns="ols4.qa.km.k8s.zbmed.de"'  \
 --set-json='backend.backendImage="ghcr.io/ebispot/ols4-backend:stable"'  \
---set-json='backend.solrImage="ghcr.io/ebispot/ols4-solr:9.0.0"'  \
---set-json='backend.neo4jImage="ghcr.io/ebispot/ols4-neo4j:4.4.9-community"'  \
+--set-json='solrImage="ghcr.io/ebispot/ols4-solr:9.0.0"'  \
+--set-json='neo4jImage="ghcr.io/ebispot/ols4-neo4j:4.4.9-community"'  \
 --set-json='backend.context="/ols4"'  \
---set-json='backend.neo4jTarballUrl="http://ols4-dataserver/neo4j.tgz"'  \
---set-json='backend.solrTarballUrl="http://ols4-dataserver/solr.tgz"'  \
-ols4/k8chart/ols4/
+--set-json='neo4jTarballUrl="http://ols4-dataserver/neo4j-nfdi4health.tgz"'  \
+--set-json='solrTarballUrl="http://ols4-dataserver/solr-nfdi4health.tgz"'  \
+ols4-backend-deployment/ols4-backend
 ```
\ No newline at end of file
diff --git a/k8s/ols4-backend/templates/ols4-neo4j-deployment.yaml b/k8s/ols4-backend/templates/ols4-neo4j-deployment.yaml
index cab2ccf..ac386bc 100644
--- a/k8s/ols4-backend/templates/ols4-neo4j-deployment.yaml
+++ b/k8s/ols4-backend/templates/ols4-neo4j-deployment.yaml
@@ -20,7 +20,7 @@ spec:
             claimName: {{ .Release.Name }}-neo4j-pvc
       containers:
         - name: neo4j
-          image: {{.Values.backend.backendImage}}
+          image: {{.Values.neo4jImage}}
           volumeMounts:
             - mountPath: "/data"
               name: {{ .Release.Name }}-neo4j-storage
@@ -37,7 +37,7 @@ spec:
             - name: NEO4J_dbms_memory_heap_maxSize
               value: 8g
             - name: NEO4J_TARBALL_URL
-              value: {{.Values.backend.neo4jTarballUrl}}
+              value: {{.Values.neo4jTarballUrl}}
             - name: NEO4J_AUTH
               value: none
           ports:
diff --git a/k8s/ols4-backend/templates/ols4-solr-deployment.yaml b/k8s/ols4-backend/templates/ols4-solr-deployment.yaml
index d039430..89b02c2 100644
--- a/k8s/ols4-backend/templates/ols4-solr-deployment.yaml
+++ b/k8s/ols4-backend/templates/ols4-solr-deployment.yaml
@@ -22,7 +22,7 @@ spec:
         fsGroup: 8983
       containers:
         - name: solr
-          image: {{.Values.backend.backendImage}}
+          image: {{.Values.solrImage}}
           volumeMounts:
             - mountPath: "/data"
               name: {{ .Release.Name }}-solr-storage
@@ -35,7 +35,7 @@ spec:
               memory: 2000Mi
           env:
             - name: SOLR_TARBALL_URL
-              value: {{.Values.backend.solrTarballUrl}}
+              value: {{.Values.solrTarballUrl}}
             - name: SOLR_HOME
               value: /data
           ports:
diff --git a/k8s/ols4-backend/values.yaml b/k8s/ols4-backend/values.yaml
index da4760b..74c9a6a 100644
--- a/k8s/ols4-backend/values.yaml
+++ b/k8s/ols4-backend/values.yaml
@@ -8,8 +8,8 @@ oidc:
     bucket:
 backend:
   context:
-  neo4jTarballUrl:
-  solrTarballUrl:
   backendImage:
-  solrImage:
-  neo4jImage:
\ No newline at end of file
+solrImage:
+neo4jImage:
+neo4jTarballUrl:
+solrTarballUrl:
\ No newline at end of file