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
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
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
21 changes: 12 additions & 9 deletions k8s/overlays/prod/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Loading