Skip to content
This repository was archived by the owner on Jul 30, 2025. It is now read-only.

Commit 7a14e32

Browse files
Ricardo Martinelli de OliveiraTomcli
Ricardo Martinelli de Oliveira
and
Tomcli
authored
feat(Tekton-compiler): Add env vars in kfp-driver to parametrize Object storage host and port (#1378)
Co-authored-by: Tommy Li <Tommy.chaoping.li@ibm.com>
1 parent 5ac8032 commit 7a14e32

File tree

6 files changed

+112
-1
lines changed

6 files changed

+112
-1
lines changed

‎backend/src/v2/compiler/tektoncompiler/container.go‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ const (
3838
MLPipelineServiceHost = "ml-pipeline.kubeflow.svc.cluster.local"
3939
MLPipelineServicePort = "8887"
4040
LauncherImage = "gcr.io/ml-pipeline/kfp-launcher@sha256:6641bf94acaeec03ee7e231241800fce2f0ad92eee25371bd5248ca800a086d7"
41+
MinioServiceHost = "minio-service.kubeflow.svc.cluster.local"
42+
MinioServicePort = "9000"
4143
)
4244

4345
var (
@@ -47,6 +49,8 @@ var (
4749
mlPipelineServiceHost = MLPipelineServiceHost
4850
mlPipelineServicePort = MLPipelineServicePort
4951
launcherImage = LauncherImage
52+
minioServiceHost = MinioServiceHost
53+
minioServicePort = MinioServicePort
5054
)
5155

5256
func initEnvVars() {
@@ -70,11 +74,18 @@ func initEnvVars() {
7074
if metadataGRPCServicePort == "" {
7175
metadataGRPCServicePort = MetadataGPRCServicePort
7276
}
73-
7477
launcherImage = os.Getenv("V2_LAUNCHER_IMAGE")
7578
if launcherImage == "" {
7679
launcherImage = LauncherImage
7780
}
81+
minioServiceHost = os.Getenv("MINIO_SERVICE_SERVICE_HOST")
82+
if minioServiceHost == "" {
83+
minioServiceHost = MinioServiceHost
84+
}
85+
minioServicePort = os.Getenv("MINIO_SERVICE_SERVICE_PORT")
86+
if minioServicePort == "" {
87+
minioServicePort = MinioServicePort
88+
}
7889
envVarInit = true
7990
}
8091

@@ -113,6 +124,20 @@ func GetLauncherImage() string {
113124
return launcherImage
114125
}
115126

127+
func GetMinioHost() string {
128+
if !envVarInit {
129+
initEnvVars()
130+
}
131+
return minioServiceHost
132+
}
133+
134+
func GetMinioPort() string {
135+
if !envVarInit {
136+
initEnvVars()
137+
}
138+
return minioServicePort
139+
}
140+
116141
// add KubernetesSpec for the container of the component
117142
func (c *pipelinerunCompiler) AddKubernetesSpec(name string, kubernetesSpec *structpb.Struct) error {
118143
err := c.saveKubernetesSpec(name, kubernetesSpec)
@@ -438,6 +463,12 @@ func (c *pipelinerunCompiler) containerExecutorTemplate(
438463
}, {
439464
Name: "ML_PIPELINE_SERVICE_PORT_GRPC",
440465
Value: GetMLPipelinePort(),
466+
}, {
467+
Name: "MINIO_SERVICE_SERVICE_HOST",
468+
Value: GetMinioHost(),
469+
}, {
470+
Name: "MINIO_SERVICE_SERVICE_PORT",
471+
Value: GetMinioPort(),
441472
}},
442473
},
443474
},

‎backend/src/v2/compiler/tektoncompiler/testdata/exit_handler.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ spec:
172172
value: ml-pipeline.kubeflow.svc.cluster.local
173173
- name: ML_PIPELINE_SERVICE_PORT_GRPC
174174
value: "8887"
175+
- name: MINIO_SERVICE_SERVICE_HOST
176+
value: "minio-service.kubeflow.svc.cluster.local"
177+
- name: MINIO_SERVICE_SERVICE_PORT
178+
value: "9000"
175179
envFrom:
176180
- configMapRef:
177181
name: metadata-grpc-configmap
@@ -351,6 +355,10 @@ spec:
351355
value: ml-pipeline.kubeflow.svc.cluster.local
352356
- name: ML_PIPELINE_SERVICE_PORT_GRPC
353357
value: "8887"
358+
- name: MINIO_SERVICE_SERVICE_HOST
359+
value: "minio-service.kubeflow.svc.cluster.local"
360+
- name: MINIO_SERVICE_SERVICE_PORT
361+
value: "9000"
354362
envFrom:
355363
- configMapRef:
356364
name: metadata-grpc-configmap
@@ -507,6 +515,10 @@ spec:
507515
value: ml-pipeline.kubeflow.svc.cluster.local
508516
- name: ML_PIPELINE_SERVICE_PORT_GRPC
509517
value: "8887"
518+
- name: MINIO_SERVICE_SERVICE_HOST
519+
value: "minio-service.kubeflow.svc.cluster.local"
520+
- name: MINIO_SERVICE_SERVICE_PORT
521+
value: "9000"
510522
envFrom:
511523
- configMapRef:
512524
name: metadata-grpc-configmap

‎backend/src/v2/compiler/tektoncompiler/testdata/hello_world.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ spec:
143143
value: ml-pipeline.kubeflow.svc.cluster.local
144144
- name: ML_PIPELINE_SERVICE_PORT_GRPC
145145
value: "8887"
146+
- name: MINIO_SERVICE_SERVICE_HOST
147+
value: "minio-service.kubeflow.svc.cluster.local"
148+
- name: MINIO_SERVICE_SERVICE_PORT
149+
value: "9000"
146150
envFrom:
147151
- configMapRef:
148152
name: metadata-grpc-configmap

‎backend/src/v2/compiler/tektoncompiler/testdata/loop_static.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@ spec:
227227
value: ml-pipeline.kubeflow.svc.cluster.local
228228
- name: ML_PIPELINE_SERVICE_PORT_GRPC
229229
value: "8887"
230+
- name: MINIO_SERVICE_SERVICE_HOST
231+
value: "minio-service.kubeflow.svc.cluster.local"
232+
- name: MINIO_SERVICE_SERVICE_PORT
233+
value: "9000"
230234
envFrom:
231235
- configMapRef:
232236
name: metadata-grpc-configmap
@@ -386,6 +390,10 @@ spec:
386390
value: ml-pipeline.kubeflow.svc.cluster.local
387391
- name: ML_PIPELINE_SERVICE_PORT_GRPC
388392
value: "8887"
393+
- name: MINIO_SERVICE_SERVICE_HOST
394+
value: "minio-service.kubeflow.svc.cluster.local"
395+
- name: MINIO_SERVICE_SERVICE_PORT
396+
value: "9000"
389397
envFrom:
390398
- configMapRef:
391399
name: metadata-grpc-configmap
@@ -587,6 +595,10 @@ spec:
587595
value: ml-pipeline.kubeflow.svc.cluster.local
588596
- name: ML_PIPELINE_SERVICE_PORT_GRPC
589597
value: "8887"
598+
- name: MINIO_SERVICE_SERVICE_HOST
599+
value: "minio-service.kubeflow.svc.cluster.local"
600+
- name: MINIO_SERVICE_SERVICE_PORT
601+
value: "9000"
590602
envFrom:
591603
- configMapRef:
592604
name: metadata-grpc-configmap

‎backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ spec:
163163
value: ml-pipeline.kubeflow.svc.cluster.local
164164
- name: ML_PIPELINE_SERVICE_PORT_GRPC
165165
value: "8887"
166+
- name: MINIO_SERVICE_SERVICE_HOST
167+
value: "minio-service.kubeflow.svc.cluster.local"
168+
- name: MINIO_SERVICE_SERVICE_PORT
169+
value: "9000"
166170
envFrom:
167171
- configMapRef:
168172
name: metadata-grpc-configmap
@@ -343,6 +347,10 @@ spec:
343347
value: ml-pipeline.kubeflow.svc.cluster.local
344348
- name: ML_PIPELINE_SERVICE_PORT_GRPC
345349
value: "8887"
350+
- name: MINIO_SERVICE_SERVICE_HOST
351+
value: "minio-service.kubeflow.svc.cluster.local"
352+
- name: MINIO_SERVICE_SERVICE_PORT
353+
value: "9000"
346354
envFrom:
347355
- configMapRef:
348356
name: metadata-grpc-configmap
@@ -477,6 +485,10 @@ spec:
477485
value: ml-pipeline.kubeflow.svc.cluster.local
478486
- name: ML_PIPELINE_SERVICE_PORT_GRPC
479487
value: "8887"
488+
- name: MINIO_SERVICE_SERVICE_HOST
489+
value: "minio-service.kubeflow.svc.cluster.local"
490+
- name: MINIO_SERVICE_SERVICE_PORT
491+
value: "9000"
480492
envFrom:
481493
- configMapRef:
482494
name: metadata-grpc-configmap
@@ -815,6 +827,10 @@ spec:
815827
value: ml-pipeline.kubeflow.svc.cluster.local
816828
- name: ML_PIPELINE_SERVICE_PORT_GRPC
817829
value: "8887"
830+
- name: MINIO_SERVICE_SERVICE_HOST
831+
value: "minio-service.kubeflow.svc.cluster.local"
832+
- name: MINIO_SERVICE_SERVICE_PORT
833+
value: "9000"
818834
envFrom:
819835
- configMapRef:
820836
name: metadata-grpc-configmap
@@ -1032,6 +1048,10 @@ spec:
10321048
value: ml-pipeline.kubeflow.svc.cluster.local
10331049
- name: ML_PIPELINE_SERVICE_PORT_GRPC
10341050
value: "8887"
1051+
- name: MINIO_SERVICE_SERVICE_HOST
1052+
value: "minio-service.kubeflow.svc.cluster.local"
1053+
- name: MINIO_SERVICE_SERVICE_PORT
1054+
value: "9000"
10351055
envFrom:
10361056
- configMapRef:
10371057
name: metadata-grpc-configmap
@@ -1193,6 +1213,10 @@ spec:
11931213
value: ml-pipeline.kubeflow.svc.cluster.local
11941214
- name: ML_PIPELINE_SERVICE_PORT_GRPC
11951215
value: "8887"
1216+
- name: MINIO_SERVICE_SERVICE_HOST
1217+
value: "minio-service.kubeflow.svc.cluster.local"
1218+
- name: MINIO_SERVICE_SERVICE_PORT
1219+
value: "9000"
11961220
envFrom:
11971221
- configMapRef:
11981222
name: metadata-grpc-configmap
@@ -1379,6 +1403,10 @@ spec:
13791403
value: ml-pipeline.kubeflow.svc.cluster.local
13801404
- name: ML_PIPELINE_SERVICE_PORT_GRPC
13811405
value: "8887"
1406+
- name: MINIO_SERVICE_SERVICE_HOST
1407+
value: "minio-service.kubeflow.svc.cluster.local"
1408+
- name: MINIO_SERVICE_SERVICE_PORT
1409+
value: "9000"
13821410
envFrom:
13831411
- configMapRef:
13841412
name: metadata-grpc-configmap
@@ -1506,6 +1534,10 @@ spec:
15061534
value: ml-pipeline.kubeflow.svc.cluster.local
15071535
- name: ML_PIPELINE_SERVICE_PORT_GRPC
15081536
value: "8887"
1537+
- name: MINIO_SERVICE_SERVICE_HOST
1538+
value: "minio-service.kubeflow.svc.cluster.local"
1539+
- name: MINIO_SERVICE_SERVICE_PORT
1540+
value: "9000"
15091541
envFrom:
15101542
- configMapRef:
15111543
name: metadata-grpc-configmap
@@ -1687,6 +1719,10 @@ spec:
16871719
value: ml-pipeline.kubeflow.svc.cluster.local
16881720
- name: ML_PIPELINE_SERVICE_PORT_GRPC
16891721
value: "8887"
1722+
- name: MINIO_SERVICE_SERVICE_HOST
1723+
value: "minio-service.kubeflow.svc.cluster.local"
1724+
- name: MINIO_SERVICE_SERVICE_PORT
1725+
value: "9000"
16901726
envFrom:
16911727
- configMapRef:
16921728
name: metadata-grpc-configmap

‎backend/src/v2/compiler/tektoncompiler/testdata/nestedloop.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ spec:
162162
value: ml-pipeline.kubeflow.svc.cluster.local
163163
- name: ML_PIPELINE_SERVICE_PORT_GRPC
164164
value: "8887"
165+
- name: MINIO_SERVICE_SERVICE_HOST
166+
value: "minio-service.kubeflow.svc.cluster.local"
167+
- name: MINIO_SERVICE_SERVICE_PORT
168+
value: "9000"
165169
envFrom:
166170
- configMapRef:
167171
name: metadata-grpc-configmap
@@ -399,6 +403,10 @@ spec:
399403
value: ml-pipeline.kubeflow.svc.cluster.local
400404
- name: ML_PIPELINE_SERVICE_PORT_GRPC
401405
value: "8887"
406+
- name: MINIO_SERVICE_SERVICE_HOST
407+
value: "minio-service.kubeflow.svc.cluster.local"
408+
- name: MINIO_SERVICE_SERVICE_PORT
409+
value: "9000"
402410
envFrom:
403411
- configMapRef:
404412
name: metadata-grpc-configmap
@@ -611,6 +619,10 @@ spec:
611619
value: ml-pipeline.kubeflow.svc.cluster.local
612620
- name: ML_PIPELINE_SERVICE_PORT_GRPC
613621
value: "8887"
622+
- name: MINIO_SERVICE_SERVICE_HOST
623+
value: "minio-service.kubeflow.svc.cluster.local"
624+
- name: MINIO_SERVICE_SERVICE_PORT
625+
value: "9000"
614626
envFrom:
615627
- configMapRef:
616628
name: metadata-grpc-configmap
@@ -827,6 +839,10 @@ spec:
827839
value: ml-pipeline.kubeflow.svc.cluster.local
828840
- name: ML_PIPELINE_SERVICE_PORT_GRPC
829841
value: "8887"
842+
- name: MINIO_SERVICE_SERVICE_HOST
843+
value: "minio-service.kubeflow.svc.cluster.local"
844+
- name: MINIO_SERVICE_SERVICE_PORT
845+
value: "9000"
830846
envFrom:
831847
- configMapRef:
832848
name: metadata-grpc-configmap

0 commit comments

Comments
 (0)