diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1486604..78c4137 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -160,17 +160,17 @@ jobs: - name: Wait for Redis to be ready run: | - kubectl wait -n openms --for=condition=ready pod -l app=template-app,component=redis --timeout=60s + kubectl wait -n openms --for=condition=ready pod -l app=quantms-ddalfq,component=redis --timeout=60s - name: Verify Redis Service is reachable run: | - kubectl run redis-test -n openms --image=redis:7-alpine --rm -i --restart=Never -- redis-cli -h template-app-redis.openms.svc.cluster.local ping + kubectl run redis-test -n openms --image=redis:7-alpine --rm -i --restart=Never -- redis-cli -h quantms-ddalfq-redis.openms.svc.cluster.local ping - name: Verify all deployments are available run: | - kubectl wait -n openms --for=condition=available deployment -l app=template-app --timeout=180s || true - kubectl get pods -n openms -l app=template-app - kubectl get services -n openms -l app=template-app + kubectl wait -n openms --for=condition=available deployment -l app=quantms-ddalfq --timeout=180s || true + kubectl get pods -n openms -l app=quantms-ddalfq + kubectl get services -n openms -l app=quantms-ddalfq - name: Curl both hostnames via nginx ingress run: | @@ -247,13 +247,13 @@ jobs: - name: Wait for Redis to be ready run: | - kubectl wait -n openms --for=condition=ready pod -l app=template-app,component=redis --timeout=60s + kubectl wait -n openms --for=condition=ready pod -l app=quantms-ddalfq,component=redis --timeout=60s - name: Verify all deployments are available run: | - kubectl wait -n openms --for=condition=available deployment -l app=template-app --timeout=180s || true - kubectl get pods -n openms -l app=template-app - kubectl get services -n openms -l app=template-app + kubectl wait -n openms --for=condition=available deployment -l app=quantms-ddalfq --timeout=180s || true + kubectl get pods -n openms -l app=quantms-ddalfq + kubectl get services -n openms -l app=quantms-ddalfq - name: Curl both hostnames via Traefik run: | @@ -262,12 +262,12 @@ jobs: trap 'kill "$PF_PID" 2>/dev/null || true' EXIT for i in $(seq 1 30); do sleep 2 - if curl -fsSo /dev/null --max-time 2 http://127.0.0.1:8080/_stcore/health -H "Host: template.webapps.openms.de"; then + if curl -fsSo /dev/null --max-time 2 http://127.0.0.1:8080/_stcore/health -H "Host: opendda.webapps.openms.de"; then break fi echo "port-forward / app not ready yet, retry $i" done - for host in template.webapps.openms.de template.webapps.openms.org; do + for host in opendda.webapps.openms.de opendda.webapps.openms.org; do curl -fsS --resolve "$host:8080:127.0.0.1" "http://$host:8080/_stcore/health" echo "" echo "$host -> 200 OK" diff --git a/k8s/base/workspace-pvc.yaml b/k8s/base/workspace-pvc.yaml index b3613be..9b423a3 100644 --- a/k8s/base/workspace-pvc.yaml +++ b/k8s/base/workspace-pvc.yaml @@ -8,4 +8,4 @@ spec: storageClassName: cinder-csi resources: requests: - storage: 500Gi + storage: 3Ti diff --git a/k8s/overlays/prod/kustomization.yaml b/k8s/overlays/prod/kustomization.yaml index 2d3fd04..f2f2245 100644 --- a/k8s/overlays/prod/kustomization.yaml +++ b/k8s/overlays/prod/kustomization.yaml @@ -5,16 +5,16 @@ resources: - ../../base components: - - ../../components/memory-tier-low + - ../../components/memory-tier-high -namePrefix: template-app- +namePrefix: quantms-ddalfq- commonLabels: - app: template-app + app: quantms-ddalfq images: - name: openms-streamlit - newName: ghcr.io/openms/streamlit-template + newName: ghcr.io/openms/quantms-web newTag: main-full patches: @@ -24,21 +24,21 @@ patches: patch: | - op: replace path: /spec/routes/0/match - value: (Host(`template.webapps.openms.de`) || Host(`template.webapps.openms.org`)) && PathPrefix(`/`) + value: (Host(`opendda.webapps.openms.de`) || Host(`opendda.webapps.openms.org`)) && PathPrefix(`/`) - op: replace path: /spec/routes/0/services/0/name - value: template-app-streamlit + value: quantms-ddalfq-streamlit - target: kind: Deployment name: streamlit patch: | - op: replace path: /spec/template/spec/containers/0/env/0/value - value: "redis://template-app-redis:6379/0" + value: "redis://quantms-ddalfq-redis:6379/0" - target: kind: Deployment name: rq-worker patch: | - op: replace path: /spec/template/spec/containers/0/env/0/value - value: "redis://template-app-redis:6379/0" + value: "redis://quantms-ddalfq-redis:6379/0"