Skip to content

Commit ab89e13

Browse files
aledeganoaledegano
committed
chore: Use pull-through cache for CI container images
Create and use specific values file for SDSC Renkulab CI-deployments.
1 parent a167f4f commit ab89e13

4 files changed

Lines changed: 226 additions & 65 deletions

File tree

‎.github/workflows/pull-request-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
KUBECONFIG: "${{ github.workspace }}/renkubot-kube.config"
140140
RENKU_RELEASE: ci-renku-${{ github.event.number }}
141141
RENKU_VALUES_FILE: "${{ github.workspace }}/values.yaml"
142-
RENKU_VALUES: minimal-deployment/minimal-deployment-values.yaml
142+
RENKU_VALUES: minimal-deployment/sdsc-azure-ci-deployment-values.yaml
143143
TEST_ARTIFACTS_PATH: "tests-artifacts-${{ github.sha }}"
144144
KUBERNETES_CLUSTER_FQDN: "dev.renku.ch"
145145
RENKU_ANONYMOUS_SESSIONS: "true"

‎helm-chart/renku/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ swagger:
11771177
enabled: true
11781178
image:
11791179
repository: swaggerapi/swagger-ui
1180-
tag: "latest"
1180+
tag: "v5.32.6"
11811181
## The image used in startup scripts to initialize different postgres databases
11821182
initDb:
11831183
image:

‎minimal-deployment/minimal-deployment-values.yaml‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ dataService:
3131
cpu: 50m
3232
memory: 750Mi
3333
replicaCount: 1
34-
enableInternalGitlab: false
3534
enableV1Services: false
3635
gateway:
3736
replicaCount: 1
38-
gitlab:
39-
enabled: false
4037
global:
4138
anonymousSessions:
4239
enabled: true
@@ -49,7 +46,6 @@ global:
4946
sentinel:
5047
enabled: false
5148
ingress:
52-
className: webapprouting.kubernetes.azure.com
5349
enabled: true
5450
hosts:
5551
- <deployment-FQDN>
@@ -63,65 +59,6 @@ keycloakx:
6359
memory: 600Mi
6460
limits:
6561
memory: 600Mi
66-
networkPolicies:
67-
sessions:
68-
egress:
69-
- to:
70-
# DNS resolution
71-
- namespaceSelector:
72-
matchLabels:
73-
kubernetes.io/metadata.name: kube-system
74-
podSelector:
75-
matchLabels:
76-
k8s-app: kube-dns
77-
ports:
78-
- port: 53
79-
protocol: UDP
80-
- port: 53
81-
protocol: TCP
82-
- to:
83-
# Allow access to any port/protocol as long as it is directed
84-
# outside the cluster. This is done by excluding
85-
# IP ranges which are reserved for private networking from
86-
# the allowed range.
87-
- ipBlock:
88-
cidr: 0.0.0.0/0
89-
except:
90-
- 10.0.0.0/8
91-
- 172.16.0.0/12
92-
- 192.168.0.0/16
93-
- to:
94-
# This resolves issues with hairpinning where a session pod is accessing
95-
# a service that runs in the cluster but through its public URL.
96-
# Without this the session pods cannot reach services (Keycloak, data services) on the public URL.
97-
- namespaceSelector:
98-
matchLabels:
99-
kubernetes.io/metadata.name: app-routing-system
100-
podSelector:
101-
matchLabels:
102-
app: nginx
103-
ports:
104-
- port: 443
105-
protocol: TCP
106-
notebooks:
107-
oidc:
108-
allowUnverifiedEmail: true
109-
sessionAffinity:
110-
nodeAffinity:
111-
requiredDuringSchedulingIgnoredDuringExecution:
112-
nodeSelectorTerms:
113-
- matchExpressions:
114-
- key: renku.io/node-purpose
115-
operator: In
116-
values:
117-
- user
118-
sessionIngress:
119-
className: webapprouting.kubernetes.azure.com
120-
sessionTolerations:
121-
- effect: NoSchedule
122-
key: renku.io/dedicated
123-
operator: Equal
124-
value: user
12562
postgresql:
12663
primary:
12764
resources:

‎minimal-deployment/sdsc-azure-ci-deployment-values.yaml‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
# This file is based on the minimal-deployment-values.yaml file,
2+
# but it overrides some values to make the deployment work on Azure.
3+
---
4+
authz:
5+
image:
6+
repository: harbor.dev.renku.ch/dockerhub_cache/authzed/spicedb
7+
resources:
8+
limits:
9+
memory: 75Mi
10+
requests:
11+
cpu: 50m
12+
memory: 75Mi
13+
dataService:
14+
image:
15+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-data-service
16+
dataTasks:
17+
image:
18+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/data-service-data-tasks
19+
resources:
20+
limits:
21+
memory: 250Mi
22+
requests:
23+
cpu: 50m
24+
memory: 250Mi
25+
k8sWatcher:
26+
image:
27+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/data-service-k8s-watcher
28+
resources:
29+
limits:
30+
memory: 200Mi
31+
requests:
32+
cpu: 20m
33+
memory: 200Mi
34+
resources:
35+
limits:
36+
memory: 750Mi
37+
requests:
38+
cpu: 50m
39+
memory: 750Mi
40+
replicaCount: 1
41+
enableV1Services: false
42+
gateway:
43+
image:
44+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-gateway
45+
replicaCount: 1
46+
global:
47+
anonymousSessions:
48+
enabled: true
49+
certificates:
50+
image:
51+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/certificates
52+
renku:
53+
domain: <deployment-FQDN>
54+
useHTTPS: true
55+
redis:
56+
port: 6379
57+
host: renku-redis-master
58+
sentinel:
59+
enabled: false
60+
ingress:
61+
enabled: true
62+
className: webapprouting.kubernetes.azure.com
63+
hosts:
64+
- <deployment-FQDN>
65+
tls:
66+
- hosts:
67+
- <deployment-FQDN>
68+
secretName: <certificate-secret-name>
69+
initDb:
70+
image:
71+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/init-db
72+
keycloakx:
73+
initRealm:
74+
image:
75+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/init-realm
76+
resources:
77+
requests:
78+
memory: 600Mi
79+
limits:
80+
memory: 600Mi
81+
platformInit:
82+
image:
83+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/platform-init
84+
networkPolicies:
85+
sessions:
86+
egress:
87+
- to:
88+
# DNS resolution
89+
- namespaceSelector:
90+
matchLabels:
91+
kubernetes.io/metadata.name: kube-system
92+
podSelector:
93+
matchLabels:
94+
k8s-app: kube-dns
95+
ports:
96+
- port: 53
97+
protocol: UDP
98+
- port: 53
99+
protocol: TCP
100+
- to:
101+
# Allow access to any port/protocol as long as it is directed
102+
# outside the cluster. This is done by excluding
103+
# IP ranges which are reserved for private networking from
104+
# the allowed range.
105+
- ipBlock:
106+
cidr: 0.0.0.0/0
107+
except:
108+
- 10.0.0.0/8
109+
- 172.16.0.0/12
110+
- 192.168.0.0/16
111+
- to:
112+
# This resolves issues with hairpinning where a session pod is accessing
113+
# a service that runs in the cluster but through its public URL.
114+
# Without this the session pods cannot reach services (Keycloak, data services) on the public URL.
115+
- namespaceSelector:
116+
matchLabels:
117+
kubernetes.io/metadata.name: app-routing-system
118+
podSelector:
119+
matchLabels:
120+
app: nginx
121+
ports:
122+
- port: 443
123+
protocol: TCP
124+
notebooks:
125+
gitRpcServer:
126+
image:
127+
name: harbor.dev.renku.ch/dockerhub_cache/renku/git-rpc-server
128+
gitHttpsProxy:
129+
image:
130+
name: harbor.dev.renku.ch/dockerhub_cache/renku/sidecars
131+
gitClone:
132+
image:
133+
name: harbor.dev.renku.ch/dockerhub_cache/renku/git-clone
134+
secretsMount:
135+
image:
136+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/secrets-mount
137+
ssh:
138+
image:
139+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/ssh-jump-host
140+
oidc:
141+
allowUnverifiedEmail: true
142+
sessionAffinity:
143+
nodeAffinity:
144+
requiredDuringSchedulingIgnoredDuringExecution:
145+
nodeSelectorTerms:
146+
- matchExpressions:
147+
- key: renku.io/node-purpose
148+
operator: In
149+
values:
150+
- user
151+
sessionIngress:
152+
className: webapprouting.kubernetes.azure.com
153+
sessionTolerations:
154+
- effect: NoSchedule
155+
key: renku.io/dedicated
156+
operator: Equal
157+
value: user
158+
postgresql:
159+
image:
160+
registry: harbor.dev.renku.ch
161+
repository: bitnami-mirror/postgresql
162+
primary:
163+
resources:
164+
limits:
165+
memory: 300Mi
166+
requests:
167+
memory: 300Mi
168+
redis:
169+
architecture: standalone
170+
image:
171+
registry: harbor.dev.renku.ch
172+
repository: bitnami-mirror/redis
173+
master:
174+
persistence:
175+
enabled: false
176+
metrics:
177+
image:
178+
registry: harbor.dev.renku.ch
179+
repository: bitnami-mirror/redis-exporter
180+
sentinel:
181+
enabled: false
182+
image:
183+
registry: harbor.dev.renku.ch
184+
repository: bitnami-mirror/redis-sentinel
185+
secretsStorage:
186+
image:
187+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/secrets-storage
188+
resources:
189+
limits:
190+
memory: 500Mi
191+
requests:
192+
cpu: 50m
193+
memory: 500Mi
194+
solr:
195+
image:
196+
registry: harbor.dev.renku.ch
197+
repository: bitnami-mirror/solr
198+
resources:
199+
limits:
200+
memory: 400Mi
201+
requests:
202+
cpu: 50m
203+
memory: 400Mi
204+
swagger:
205+
image:
206+
repository: harbor.dev.renku.ch/dockerhub_cache/swaggerapi/swagger-ui
207+
ui:
208+
client:
209+
image:
210+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-ui
211+
resources:
212+
limits:
213+
memory: 300Mi
214+
requests:
215+
cpu: 10m
216+
memory: 300Mi
217+
server:
218+
image:
219+
repository: harbor.dev.renku.ch/dockerhub_cache/renku/renku-ui-server
220+
resources:
221+
limits:
222+
memory: 75Mi
223+
requests:
224+
memory: 75Mi

0 commit comments

Comments
 (0)