diff --git a/chart/templates/redis-deployment.yaml b/chart/templates/redis-deployment.yaml deleted file mode 100644 index c437d80..0000000 --- a/chart/templates/redis-deployment.yaml +++ /dev/null @@ -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 diff --git a/chart/templates/redis-pvc.yaml b/chart/templates/redis-pvc.yaml deleted file mode 100644 index 0b843d4..0000000 --- a/chart/templates/redis-pvc.yaml +++ /dev/null @@ -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 }} diff --git a/chart/templates/redis-service.yaml b/chart/templates/redis-service.yaml deleted file mode 100644 index c82669a..0000000 --- a/chart/templates/redis-service.yaml +++ /dev/null @@ -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 }} diff --git a/chart/templates/stac-server-deployment.yaml b/chart/templates/stac-server-deployment.yaml index 5a553c5..6b7d125 100644 --- a/chart/templates/stac-server-deployment.yaml +++ b/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 - value: "{{ .Values.stacServer.environment.REDIS_HOST }}" + - name: API_KEY + 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 diff --git a/chart/templates/stac-server-service.yaml b/chart/templates/stac-server-service.yaml deleted file mode 100644 index 5503e5a..0000000 --- a/chart/templates/stac-server-service.yaml +++ /dev/null @@ -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 diff --git a/chart/templates/web-query-builder-deployment.yaml b/chart/templates/web-query-builder-deployment.yaml index b048064..dd90330 100644 --- a/chart/templates/web-query-builder-deployment.yaml +++ b/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 }} --- diff --git a/chart/values.yaml b/chart/values.yaml index 74f8570..6f9ef8c 100644 --- a/chart/values.yaml +++ b/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" diff --git a/scripts/deploy.sh b/scripts/deploy.sh index f950edf..5537bda 100755 --- a/scripts/deploy.sh +++ b/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 diff --git a/scripts/restart.sh b/scripts/restart.sh index 3cbbe6d..b44478d 100755 --- a/scripts/restart.sh +++ b/scripts/restart.sh @@ -1,3 +1,3 @@ # kubectl rollout restart deployment/redis -kubectl rollout restart deployment/web-query-builder -kubectl rollout restart deployment/stac-server +kubectl -n qubed rollout restart deployment/web-query-builder +kubectl -n qubed rollout restart deployment/stac-server