Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion k8s/base/workspace-pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
storageClassName: cinder-csi
resources:
requests:
storage: 500Gi
storage: 3Ti
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Scope drift: this base PVC change applies to all overlays, not just prod.

Line 11 raises the base request to 3Ti, which affects every environment inheriting k8s/base. The PR objective is prod-only sizing, so this should be done as an overlay patch in production to avoid unintended cost/capacity impact elsewhere.

Suggested direction
# k8s/base/workspace-pvc.yaml
-      storage: 3Ti
+      storage: 500Gi
# k8s/overlays/prod/workspace-pvc-patch.yaml (new)
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
  name: workspaces-pvc
spec:
  resources:
    requests:
      storage: 3Ti
# k8s/overlays/prod/kustomization.yaml
patchesStrategicMerge:
  - workspace-pvc-patch.yaml
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@k8s/base/workspace-pvc.yaml` at line 11, The base PersistentVolumeClaim
"workspaces-pvc" was changed to request 3Ti at spec.resources.requests.storage,
which will affect all environments; instead revert that change in the base and
add a prod-only strategic merge patch that updates "workspaces-pvc" to storage:
3Ti in the prod overlay. Create a new overlay patch (e.g.,
workspace-pvc-patch.yaml) containing the PersistentVolumeClaim metadata name:
workspaces-pvc and spec.resources.requests.storage: 3Ti, then reference it from
the prod kustomization under patchesStrategicMerge so only the prod overlay
receives the increased size.

16 changes: 8 additions & 8 deletions k8s/overlays/prod/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Loading