Skip to content

Commit c316095

Browse files
authored
Feature/notebook image (#4)
* Makes notebook image configurable Uses kfdef parameters to inform the image to platiagro/notebook. This will allow custom configurations for GPU. * Adds a custom configuration file for GPU environments Sets platiagro/platiagro-notebook-image-gpu:0.1.0 as default docker image for kfdef/kfctl_platiagro_tls_gpu.v0.1.0.yaml. * Adds all platiagro/pipelines env variables to manifest Makes env variables explicit in manifests so it's easier to change values.
1 parent d6fcd4d commit c316095

8 files changed

+358
-1
lines changed

kfdef/kfctl_platiagro.v0.1.0.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ spec:
257257
parameters:
258258
- name: namespace
259259
value: anonymous
260+
- name: image
261+
value: platiagro/platiagro-notebook-image:0.1.0
260262
- name: memory-limits
261263
value: 4G
262264
- name: cpu-limits

kfdef/kfctl_platiagro_tls.v0.1.0.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ spec:
267267
parameters:
268268
- name: namespace
269269
value: anonymous
270+
- name: image
271+
value: platiagro/platiagro-notebook-image:0.1.0
270272
- name: memory-limits
271273
value: 4G
272274
- name: cpu-limits
+333
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,333 @@
1+
apiVersion: kfdef.apps.kubeflow.org/v1
2+
kind: KfDef
3+
metadata:
4+
namespace: kubeflow
5+
spec:
6+
applications:
7+
- kustomizeConfig:
8+
parameters:
9+
- name: namespace
10+
value: istio-system
11+
repoRef:
12+
name: manifests
13+
path: istio/istio-crds
14+
name: istio-crds
15+
- kustomizeConfig:
16+
parameters:
17+
- name: namespace
18+
value: istio-system
19+
repoRef:
20+
name: manifests
21+
path: istio/istio-install
22+
name: istio-install
23+
- kustomizeConfig:
24+
overlays:
25+
- https-gateway
26+
parameters:
27+
- name: clusterRbacConfig
28+
value: "OFF"
29+
repoRef:
30+
name: manifests
31+
path: istio/istio
32+
name: istio
33+
- kustomizeConfig:
34+
parameters:
35+
- name: namespace
36+
value: istio-system
37+
repoRef:
38+
name: manifests
39+
path: istio/add-anonymous-user-filter
40+
name: add-anonymous-user-filter
41+
- kustomizeConfig:
42+
repoRef:
43+
name: manifests
44+
path: application/application-crds
45+
name: application-crds
46+
- kustomizeConfig:
47+
overlays:
48+
- application
49+
repoRef:
50+
name: manifests
51+
path: application/application
52+
name: application
53+
- kustomizeConfig:
54+
parameters:
55+
- name: namespace
56+
value: cert-manager
57+
repoRef:
58+
name: manifests
59+
path: cert-manager/cert-manager-crds
60+
name: cert-manager-crds
61+
- kustomizeConfig:
62+
parameters:
63+
- name: namespace
64+
value: kube-system
65+
repoRef:
66+
name: manifests
67+
path: cert-manager/cert-manager-kube-system-resources
68+
name: cert-manager-kube-system-resources
69+
- kustomizeConfig:
70+
overlays:
71+
- self-signed
72+
- application
73+
parameters:
74+
- name: namespace
75+
value: cert-manager
76+
repoRef:
77+
name: manifests
78+
path: cert-manager/cert-manager
79+
name: cert-manager
80+
- kustomizeConfig:
81+
parameters:
82+
- name: namespace
83+
value: istio-system
84+
repoRef:
85+
name: manifests
86+
path: istio/ingressgateway-self-signed-cert
87+
name: ingressgateway-self-signed-cert
88+
- kustomizeConfig:
89+
repoRef:
90+
name: manifests
91+
path: metacontroller
92+
name: metacontroller
93+
- kustomizeConfig:
94+
overlays:
95+
- istio
96+
- application
97+
repoRef:
98+
name: manifests
99+
path: argo
100+
name: argo
101+
- kustomizeConfig:
102+
repoRef:
103+
name: manifests
104+
path: kubeflow-roles
105+
name: kubeflow-roles
106+
- kustomizeConfig:
107+
overlays:
108+
- istio
109+
- application
110+
repoRef:
111+
name: manifests
112+
path: common/centraldashboard
113+
name: centraldashboard
114+
- kustomizeConfig:
115+
overlays:
116+
- application
117+
repoRef:
118+
name: manifests
119+
path: admission-webhook/bootstrap
120+
name: bootstrap
121+
- kustomizeConfig:
122+
overlays:
123+
- application
124+
repoRef:
125+
name: manifests
126+
path: admission-webhook/webhook
127+
name: webhook
128+
- kustomizeConfig:
129+
overlays:
130+
- istio
131+
- application
132+
parameters:
133+
- name: userid-header
134+
value: kubeflow-userid
135+
repoRef:
136+
name: manifests
137+
path: jupyter/jupyter-web-app
138+
name: jupyter-web-app
139+
- kustomizeConfig:
140+
overlays:
141+
- istio
142+
- application
143+
repoRef:
144+
name: manifests
145+
path: jupyter/notebook-controller
146+
name: notebook-controller
147+
- kustomizeConfig:
148+
parameters:
149+
- name: namespace
150+
value: deployments
151+
overlays:
152+
- application
153+
repoRef:
154+
name: manifests
155+
path: pipeline/api-service
156+
name: api-service
157+
- kustomizeConfig:
158+
overlays:
159+
- application
160+
parameters:
161+
- name: minioPvcName
162+
value: minio-pv-claim
163+
repoRef:
164+
name: manifests
165+
path: pipeline/minio
166+
name: minio
167+
- kustomizeConfig:
168+
overlays:
169+
- application
170+
parameters:
171+
- name: mysqlPvcName
172+
value: mysql-pv-claim
173+
repoRef:
174+
name: manifests
175+
path: pipeline/mysql
176+
name: mysql
177+
- kustomizeConfig:
178+
parameters:
179+
- name: namespace
180+
value: deployments
181+
overlays:
182+
- application
183+
repoRef:
184+
name: manifests
185+
path: pipeline/persistent-agent
186+
name: persistent-agent
187+
- kustomizeConfig:
188+
parameters:
189+
- name: namespace
190+
value: deployments
191+
overlays:
192+
- application
193+
repoRef:
194+
name: manifests
195+
path: pipeline/pipelines-runner
196+
name: pipelines-runner
197+
- kustomizeConfig:
198+
parameters:
199+
- name: namespace
200+
value: deployments
201+
overlays:
202+
- istio
203+
- application
204+
repoRef:
205+
name: manifests
206+
path: pipeline/pipelines-ui
207+
name: pipelines-ui
208+
- kustomizeConfig:
209+
parameters:
210+
- name: namespace
211+
value: deployments
212+
overlays:
213+
- application
214+
repoRef:
215+
name: manifests
216+
path: pipeline/pipelines-viewer
217+
name: pipelines-viewer
218+
- kustomizeConfig:
219+
parameters:
220+
- name: namespace
221+
value: deployments
222+
overlays:
223+
- application
224+
repoRef:
225+
name: manifests
226+
path: pipeline/scheduledworkflow
227+
name: scheduledworkflow
228+
- kustomizeConfig:
229+
parameters:
230+
- name: namespace
231+
value: deployments
232+
overlays:
233+
- application
234+
repoRef:
235+
name: manifests
236+
path: pipeline/pipeline-visualization-service
237+
name: pipeline-visualization-service
238+
- kustomizeConfig:
239+
overlays:
240+
- application
241+
- istio
242+
parameters:
243+
- name: admin
244+
245+
repoRef:
246+
name: manifests
247+
path: profiles
248+
name: profiles
249+
- kustomizeConfig:
250+
overlays:
251+
- application
252+
repoRef:
253+
name: manifests
254+
path: seldon/seldon-core-operator
255+
name: seldon-core-operator
256+
- kustomizeConfig:
257+
parameters:
258+
- name: user
259+
260+
- name: profile-name
261+
value: anonymous
262+
repoRef:
263+
name: manifests
264+
path: default-install
265+
name: default-install
266+
- kustomizeConfig:
267+
parameters:
268+
- name: namespace
269+
value: anonymous
270+
- name: image
271+
value: platiagro/platiagro-notebook-image-gpu:0.1.0
272+
- name: memory-limits
273+
value: 4G
274+
- name: cpu-limits
275+
value: "2"
276+
repoRef:
277+
name: manifests
278+
path: platiagro/notebook
279+
name: notebook
280+
- kustomizeConfig:
281+
parameters:
282+
- name: namespace
283+
value: platiagro
284+
overlays:
285+
- istio
286+
repoRef:
287+
name: manifests
288+
path: platiagro/namespace
289+
name: namespace
290+
- kustomizeConfig:
291+
parameters:
292+
- name: namespace
293+
value: platiagro
294+
overlays:
295+
- istio
296+
repoRef:
297+
name: manifests
298+
path: platiagro/datasets
299+
name: datasets
300+
- kustomizeConfig:
301+
parameters:
302+
- name: namespace
303+
value: platiagro
304+
overlays:
305+
- istio
306+
repoRef:
307+
name: manifests
308+
path: platiagro/pipelines
309+
name: pipelines
310+
- kustomizeConfig:
311+
parameters:
312+
- name: namespace
313+
value: platiagro
314+
overlays:
315+
- istio
316+
repoRef:
317+
name: manifests
318+
path: platiagro/projects
319+
name: projects
320+
- kustomizeConfig:
321+
parameters:
322+
- name: namespace
323+
value: platiagro
324+
overlays:
325+
- istio
326+
repoRef:
327+
name: manifests
328+
path: platiagro/web-ui
329+
name: web-ui
330+
repos:
331+
- name: manifests
332+
uri: https://github.com/platiagro/manifests/archive/v0.1.0-kubeflow-v1.0-branch.tar.gz
333+
version: v0.1.0

platiagro/notebook/base/kustomization.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ vars:
1616
apiVersion: v1
1717
fieldref:
1818
fieldpath: data.namespace
19+
- name: image
20+
objref:
21+
kind: ConfigMap
22+
name: platiagro-notebook-parameters
23+
apiVersion: v1
24+
fieldref:
25+
fieldpath: data.image
1926
- name: memory-limits
2027
objref:
2128
kind: ConfigMap

platiagro/notebook/base/notebook.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
template:
1111
spec:
1212
containers:
13-
- image: platiagro/platiagro-notebook-image:0.1.0
13+
- image: "$(image)"
1414
name: server
1515
resources:
1616
requests:

platiagro/notebook/base/params.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
namespace=anonymous
2+
image=platiagro/platiagro-notebook-image:0.1.0
23
memory-limits=4G
34
cpu-limits=2

platiagro/notebook/base/params.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
varReference:
2+
- path: spec/template/spec/containers/image
3+
kind: Notebook
24
- path: spec/template/spec/containers/resources/limits/cpu
35
kind: Notebook
46
- path: spec/template/spec/containers/resources/limits/memory

0 commit comments

Comments
 (0)