update chart

chart/templates/redis-deployment.yaml

@@ -1,28 +0,0 @@
-# templates/redis-deployment.yaml
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-        - name: redis
-          image: "redis:alpine"
-          command: ["redis-server", "--appendonly", "yes"]
-          ports:
-            - containerPort: {{ .Values.redis.servicePort }}
-          # volumeMounts:
-          #   - mountPath: /data
-          #     name: redis-data
-      # volumes:
-      #   - name: redis-data
-      #     persistentVolumeClaim:
-      #       claimName: redis-data

chart/templates/redis-pvc.yaml

@@ -1,14 +0,0 @@
-# templates/redis-pvc.yaml
-
-{{- if .Values.redis.pvc.enabled }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: redis-data
-spec:
-  accessModes: {{ .Values.redis.pvc.accessModes }}
-  resources:
-    requests:
-      storage: {{ .Values.redis.pvc.size }}
-  storageClassName: {{ .Values.redis.pvc.storageClassName | quote }}
-{{- end }}

chart/templates/redis-service.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-spec:
-  selector:
-    app: redis
-  ports:
-    - protocol: TCP
-      port: {{ .Values.redis.servicePort }}
-      targetPort: {{ .Values.redis.servicePort }}

chart/templates/stac-server-deployment.yaml

@@ -14,20 +14,28 @@ spec:
       labels:
         app: stac-server
     spec:
-      initContainers:
-        - name: wait-for-redis
-          image: busybox
-          command:
-            [
-              'sh', '-c',
-              'until nc -z -v -w30 {{ .Values.stacServer.environment.REDIS_HOST }} {{ .Values.redis.service.port }}; do echo "Waiting for Redis..."; sleep 5; done;'
-            ]
       containers:
         - name: stac-server
           image: "{{ .Values.stacServer.image.repository }}:{{ .Values.stacServer.image.tag }}"
           imagePullPolicy: {{ .Values.stacServer.image.pullPolicy }}
           env:
-            - name: REDIS_HOST
+            - name: API_KEY
-              value: "{{ .Values.stacServer.environment.REDIS_HOST }}"
+              valueFrom:
+                secretKeyRef:
+                    name: api-key
+                    key: API_KEY
           ports:
             - containerPort: {{ .Values.stacServer.servicePort }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: stac-server
+spec:
+  selector:
+    app: stac-server
+  ports:
+    - protocol: TCP
+      port: {{ .Values.stacServer.servicePort }}
+      targetPort: {{ .Values.stacServer.servicePort }}
+  type: ClusterIP

chart/templates/stac-server-service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: stac-server
-spec:
-  selector:
-    app: stac-server
-  ports:
-    - protocol: TCP
-      port: {{ .Values.stacServer.servicePort }}
-      targetPort: {{ .Values.stacServer.servicePort }}
-  type: ClusterIP

chart/templates/web-query-builder-deployment.yaml

@@ -19,7 +19,7 @@ spec:
           imagePullPolicy: {{ .Values.webQueryBuilder.image.pullPolicy }}
           env:
             - name: API_HOST
-              value: stac-server
+              value: "https://{{ .Values.ingress.hostname }}/api/v1/stac/climate-dt"
           ports:
             - containerPort: {{ .Values.webQueryBuilder.servicePort }}
 ---

chart/values.yaml

@@ -1,14 +1,3 @@
-redis:
-  servicePort: 6379
-  pvc:
-    enabled: true
-    storageClassName: ""
-    accessModes:
-      - ReadWriteOnce
-    size: 1Gi
-  service:
-    port: 6379
-
 stacServer:
   enabled: true
   image:
@@ -16,8 +5,6 @@ stacServer:
     tag: "latest"
     pullPolicy: Always
   servicePort: 80
-  environment:
-    REDIS_HOST: "redis"
 
 webQueryBuilder:
   enabled: true
@@ -30,4 +17,4 @@ webQueryBuilder:
 ingress:
   enabled: True
   tlsSecretName: "lumi-wildcard-tls"
-  hostname: "climate-catalogue.lumi.apps.dte.destination-earth.eu"
+  hostname: "qubed.lumi.apps.dte.destination-earth.eu"

scripts/deploy.sh

@@ -1 +1,2 @@
-helm upgrade stac-server chart -n stac-server
+# helm install qubed chart -n qubed
+helm upgrade qubed chart -n qubed

scripts/restart.sh

@@ -1,3 +1,3 @@
 # kubectl rollout restart deployment/redis
-kubectl rollout restart deployment/web-query-builder
+kubectl -n qubed rollout restart deployment/web-query-builder
-kubectl rollout restart deployment/stac-server
+kubectl -n qubed rollout restart deployment/stac-server