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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
KUBECONFIG: "${{ github.workspace }}/renkubot-kube.config"
RENKU_RELEASE: ci-renku-${{ github.event.number }}
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
RENKU_VALUES: minimal-deployment/minimal-deployment-values.yaml
RENKU_VALUES: minimal-deployment/sdsc-azure-ci-deployment-values.yaml
TEST_ARTIFACTS_PATH: "tests-artifacts-${{ github.sha }}"
KUBERNETES_CLUSTER_FQDN: "dev.renku.ch"
RENKU_ANONYMOUS_SESSIONS: "true"
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/renku/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ swagger:
enabled: true
image:
repository: swaggerapi/swagger-ui
tag: "latest"
tag: "v5.32.6"
## The image used in startup scripts to initialize different postgres databases
initDb:
image:
Expand Down
63 changes: 0 additions & 63 deletions minimal-deployment/minimal-deployment-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@ dataService:
cpu: 50m
memory: 750Mi
replicaCount: 1
enableInternalGitlab: false
enableV1Services: false
gateway:
replicaCount: 1
gitlab:
enabled: false
global:
anonymousSessions:
enabled: true
Expand All @@ -49,7 +46,6 @@ global:
sentinel:
enabled: false
ingress:
className: webapprouting.kubernetes.azure.com
enabled: true
hosts:
- <deployment-FQDN>
Expand All @@ -63,65 +59,6 @@ keycloakx:
memory: 600Mi
limits:
memory: 600Mi
networkPolicies:
sessions:
egress:
- to:
# DNS resolution
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: kube-system
podSelector:
matchLabels:
k8s-app: kube-dns
ports:
- port: 53
protocol: UDP
- port: 53
protocol: TCP
- to:
# Allow access to any port/protocol as long as it is directed
# outside the cluster. This is done by excluding
# IP ranges which are reserved for private networking from
# the allowed range.
- ipBlock:
cidr: 0.0.0.0/0
except:
- 10.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- to:
# This resolves issues with hairpinning where a session pod is accessing
# a service that runs in the cluster but through its public URL.
# Without this the session pods cannot reach services (Keycloak, data services) on the public URL.
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: app-routing-system
podSelector:
matchLabels:
app: nginx
ports:
- port: 443
protocol: TCP
Comment thread
olevski marked this conversation as resolved.
notebooks:
oidc:
allowUnverifiedEmail: true
sessionAffinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: renku.io/node-purpose
operator: In
values:
- user
sessionIngress:
className: webapprouting.kubernetes.azure.com
sessionTolerations:
- effect: NoSchedule
key: renku.io/dedicated
operator: Equal
value: user
postgresql:
primary:
resources:
Expand Down
224 changes: 224 additions & 0 deletions minimal-deployment/sdsc-azure-ci-deployment-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
# This file is based on the minimal-deployment-values.yaml file,
# but it overrides some values to make the deployment work on Azure.
---
authz:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/authzed/spicedb
resources:
limits:
memory: 75Mi
requests:
cpu: 50m
memory: 75Mi
dataService:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-data-service
dataTasks:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/data-service-data-tasks
resources:
limits:
memory: 250Mi
requests:
cpu: 50m
memory: 250Mi
k8sWatcher:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/data-service-k8s-watcher
resources:
limits:
memory: 200Mi
requests:
cpu: 20m
memory: 200Mi
resources:
limits:
memory: 750Mi
requests:
cpu: 50m
memory: 750Mi
replicaCount: 1
enableV1Services: false
gateway:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-gateway
replicaCount: 1
global:
anonymousSessions:
enabled: true
certificates:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/certificates
renku:
domain: <deployment-FQDN>
useHTTPS: true
redis:
port: 6379
host: renku-redis-master
sentinel:
enabled: false
ingress:
enabled: true
className: webapprouting.kubernetes.azure.com
hosts:
- <deployment-FQDN>
tls:
- hosts:
- <deployment-FQDN>
secretName: <certificate-secret-name>
initDb:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/init-db
keycloakx:
initRealm:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/init-realm
resources:
requests:
memory: 600Mi
limits:
memory: 600Mi
platformInit:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/platform-init
networkPolicies:
sessions:
egress:
- to:
# DNS resolution
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: kube-system
podSelector:
matchLabels:
k8s-app: kube-dns
ports:
- port: 53
protocol: UDP
- port: 53
protocol: TCP
- to:
# Allow access to any port/protocol as long as it is directed
# outside the cluster. This is done by excluding
# IP ranges which are reserved for private networking from
# the allowed range.
- ipBlock:
cidr: 0.0.0.0/0
except:
- 10.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- to:
# This resolves issues with hairpinning where a session pod is accessing
# a service that runs in the cluster but through its public URL.
# Without this the session pods cannot reach services (Keycloak, data services) on the public URL.
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: app-routing-system
podSelector:
matchLabels:
app: nginx
ports:
- port: 443
protocol: TCP
notebooks:
gitRpcServer:
image:
name: harbor.dev.renku.ch/dockerhub_cache/renku/git-rpc-server
gitHttpsProxy:
image:
name: harbor.dev.renku.ch/dockerhub_cache/renku/sidecars
gitClone:
image:
name: harbor.dev.renku.ch/dockerhub_cache/renku/git-clone
secretsMount:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/secrets-mount
ssh:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/ssh-jump-host
oidc:
allowUnverifiedEmail: true
sessionAffinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: renku.io/node-purpose
operator: In
values:
- user
sessionIngress:
className: webapprouting.kubernetes.azure.com
sessionTolerations:
- effect: NoSchedule
key: renku.io/dedicated
operator: Equal
value: user
postgresql:
image:
registry: harbor.dev.renku.ch
repository: bitnami-mirror/postgresql
primary:
resources:
limits:
memory: 300Mi
requests:
memory: 300Mi
redis:
architecture: standalone
image:
registry: harbor.dev.renku.ch
repository: bitnami-mirror/redis
master:
persistence:
enabled: false
metrics:
image:
registry: harbor.dev.renku.ch
repository: bitnami-mirror/redis-exporter
sentinel:
enabled: false
image:
registry: harbor.dev.renku.ch
repository: bitnami-mirror/redis-sentinel
secretsStorage:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/secrets-storage
resources:
limits:
memory: 500Mi
requests:
cpu: 50m
memory: 500Mi
solr:
image:
registry: harbor.dev.renku.ch
repository: bitnami-mirror/solr
resources:
limits:
memory: 400Mi
requests:
cpu: 50m
memory: 400Mi
swagger:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/swaggerapi/swagger-ui
ui:
client:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-ui
resources:
limits:
memory: 300Mi
requests:
cpu: 10m
memory: 300Mi
server:
image:
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-ui-server
resources:
limits:
memory: 75Mi
requests:
memory: 75Mi
Loading