From 55249d119a47a310725e2b1e9fee76ca2a0d3a97 Mon Sep 17 00:00:00 2001
From: Tom <thomas.hodson@ecmwf.int>
Date: Thu, 5 Dec 2024 16:41:55 +0100
Subject: [PATCH] update chart

---
 chart/Chart.yaml                         | 18 -------
 chart/templates/ingress.yaml             | 11 +++-
 chart/templates/redis-load-data-job.yaml | 66 ++++++++++++------------
 chart/values.yaml                        |  2 +-
 4 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index f1b3f41..445fc76 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,24 +1,6 @@
 apiVersion: v2
 name: stac-server
 description: A Helm chart for the STAC Server with frontend, STAC API and caching service. 
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
 appVersion: "0.1.0"
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 7058f6c..557fcc1 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   name: stac-server-ingress
 spec:
+  ingressClassName: nginx
   rules:
     - host: {{ .Values.stacServer.ingress.hostname }}
       http:
@@ -15,4 +16,12 @@ spec:
                 name: stac-server
                 port:
                   number: {{ .Values.stacServer.servicePort }}
-{{- end }}
\ No newline at end of file
+  tls:
+    - hosts:
+        - {{ .Values.stacServer.ingress.hostname }}
+      secretName: lumi-wildcard-tls
+{{- end }}
+
+
+
+
diff --git a/chart/templates/redis-load-data-job.yaml b/chart/templates/redis-load-data-job.yaml
index 4078c69..303ec6b 100644
--- a/chart/templates/redis-load-data-job.yaml
+++ b/chart/templates/redis-load-data-job.yaml
@@ -1,33 +1,33 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: redis-load-data
-  annotations:
-    "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
-spec:
-  template:
-    spec:
-      containers:
-        - name: load-data
-          image: redis:alpine
-          command:
-            - sh
-            - -c
-            - |
-              # Wait for Redis to be ready
-              until redis-cli -h redis ping | grep PONG; do
-                echo "Waiting for Redis...";
-                sleep 2;
-              done;
-              # Load data into Redis
-              redis-cli -h redis set compressed_catalog "$(cat /data/compressed_tree.json)"
-          volumeMounts:
-            - name: redis-init-data
-              mountPath: /data
-      volumes:
-        - name: redis-init-data
-          configMap:
-            name: redis-init-data
-      restartPolicy: OnFailure
\ No newline at end of file
+# apiVersion: batch/v1
+# kind: Job
+# metadata:
+#   name: redis-load-data
+#   annotations:
+#     "helm.sh/hook": post-install,post-upgrade
+#     "helm.sh/hook-weight": "1"
+#     "helm.sh/hook-delete-policy": before-hook-creation
+# spec:
+#   template:
+#     spec:
+#       containers:
+#         - name: load-data
+#           image: redis:alpine
+#           command:
+#             - sh
+#             - -c
+#             - |
+#               # Wait for Redis to be ready
+#               until redis-cli -h redis ping | grep PONG; do
+#                 echo "Waiting for Redis...";
+#                 sleep 2;
+#               done;
+#               # Load data into Redis
+#               redis-cli -h redis set compressed_catalog "$(cat /data/compressed_tree.json)"
+#           volumeMounts:
+#             - name: redis-init-data
+#               mountPath: /data
+#       volumes:
+#         - name: redis-init-data
+#           configMap:
+#             name: redis-init-data
+#       restartPolicy: OnFailure
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index 1edbecf..ecce2fe 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -22,4 +22,4 @@ stacServer:
     REDIS_HOST: "redis"
   ingress:
     enabled: True
-    hostname: "stac-server.lumi-vip.apps.dte.destination-earth.eu "
\ No newline at end of file
+    hostname: "climate.catalogue.lumi.apps.dte.destination-earth.eu"
\ No newline at end of file