diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 27648fc..11b90be 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -76,7 +76,7 @@ jobs: type=ref,event=branch,suffix=-${{ matrix.variant }} type=ref,event=tag,suffix=-${{ matrix.variant }} type=sha,prefix=,suffix=-${{ matrix.variant }} - type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/main' }} + type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }} - name: Build and conditionally push uses: docker/build-push-action@v5 @@ -303,7 +303,7 @@ jobs: type=ref,event=branch,suffix=-${{ matrix.variant }} type=ref,event=tag,suffix=-${{ matrix.variant }} type=sha,prefix=,suffix=-${{ matrix.variant }} - type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/main' }} + type=raw,value=latest,enable=${{ matrix.variant == 'full' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }} - name: Log in to GHCR for ORAS push env: 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..f4a7fc6 100644 --- a/k8s/overlays/prod/kustomization.yaml +++ b/k8s/overlays/prod/kustomization.yaml @@ -5,17 +5,17 @@ resources: - ../../base components: - - ../../components/memory-tier-low + - ../../components/memory-tier-high -namePrefix: template-app- +namePrefix: flashapp- commonLabels: - app: template-app + app: flashapp images: - name: openms-streamlit - newName: ghcr.io/openms/streamlit-template - newTag: main-full + newName: ghcr.io/openms/flashapp + newTag: latest patches: - target: @@ -24,21 +24,24 @@ patches: patch: | - op: replace path: /spec/routes/0/match - value: (Host(`template.webapps.openms.de`) || Host(`template.webapps.openms.org`)) && PathPrefix(`/`) + value: (Host(`flashapp.webapps.openms.de`) || Host(`flashapp.webapps.openms.org`)) && PathPrefix(`/`) - op: replace path: /spec/routes/0/services/0/name - value: template-app-streamlit + value: flashapp-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://flashapp-redis:6379/0" - target: kind: Deployment name: rq-worker patch: | + - op: replace + path: /spec/replicas + value: 5 - op: replace path: /spec/template/spec/containers/0/env/0/value - value: "redis://template-app-redis:6379/0" + value: "redis://flashapp-redis:6379/0"