Skip to content

Commit 5b645cb

Browse files
hbelmirohbelmiro
committed
Fixed tests after rebase
Signed-off-by: Helber Belmiro <[email protected]>
1 parent 65049cb commit 5b645cb

11 files changed

+194
-11
lines changed

‎backend/src/apiserver/resource/resource_manager.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import (
3131
"github.com/kubeflow/pipelines/backend/src/v2/objectstore"
3232
"github.com/kubeflow/pipelines/third_party/ml-metadata/go/ml_metadata"
3333

34-
scheduledworkflow "github.com/kubeflow/pipelines/backend/src/crd/pkg/apis/scheduledworkflow/v1beta1"
35-
3634
"github.com/cenkalti/backoff"
3735
"github.com/golang/glog"
3836
"github.com/kubeflow/pipelines/backend/src/apiserver/archive"

‎backend/src/v2/cacheutils/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type client struct {
7070
var _ Client = &client{}
7171

7272
// NewClient creates a Client.
73-
func NewClient(cacheDisabled bool) (Client, error) {
73+
func NewClient(cacheDisabled bool, mlPipelineServiceTLSEnabled bool) (Client, error) {
7474
if cacheDisabled {
7575
return &disabledCacheClient{}, nil
7676
}

‎backend/src/v2/cacheutils/cache_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func TestGenerateCacheKey(t *testing.T) {
135135
wantErr: false,
136136
},
137137
}
138-
cacheClient, err := NewClient(false)
138+
cacheClient, err := NewClient(false, false)
139139
require.NoError(t, err)
140140
for _, test := range tests {
141141

@@ -257,7 +257,7 @@ func TestGenerateFingerPrint(t *testing.T) {
257257
fingerPrint: "0a4cc1f15cdfad5170e1358518f7128c5278500a670db1b9a3f3d83b93db396e",
258258
},
259259
}
260-
cacheClient, err := NewClient(false)
260+
cacheClient, err := NewClient(false, false)
261261
require.NoError(t, err)
262262
for _, test := range tests {
263263
t.Run(test.name, func(t *testing.T) {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ import (
3434
)
3535

3636
const (
37-
volumeNameKFPLauncher = "kfp-launcher"
38-
volumeNameCABundle = "ca-bundle"
39-
LauncherImageEnvVar = "V2_LAUNCHER_IMAGE"
40-
LauncherCommandEnvVar = "V2_LAUNCHER_COMMAND"
41-
DefaultLauncherCommand = "launcher-v2"
42-
DriverImageEnvVar = "V2_DRIVER_IMAGE"
37+
volumeNameKFPLauncher = "kfp-launcher"
38+
volumeNameCABundle = "ca-bundle"
39+
LauncherImageEnvVar = "V2_LAUNCHER_IMAGE"
40+
DriverImageEnvVar = "V2_DRIVER_IMAGE"
4341
// DefaultLauncherImage & DefaultDriverImage are set as latest here
4442
// but are overridden by environment variables set via k8s manifests.
4543
// For releases, the manifest will have the correct release version set.

‎backend/src/v2/compiler/argocompiler/testdata/hello_world_cache_disabled.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,25 @@ spec:
6161
- ''
6262
- --no_proxy
6363
- ''
64+
- --mlPipelineServiceTLSEnabled
65+
- "false"
66+
- --mlmd_server_address
67+
- "metadata-grpc-service"
68+
- --mlmd_server_port
69+
- "8080"
70+
- --metadataTLSEnabled
71+
- "false"
72+
- --ca_cert_path
73+
- ""
6474
- --cache_disabled
6575
- 'true'
6676
command:
6777
- driver
78+
env:
79+
- name: ML_PIPELINE_SERVICE_HOST
80+
value: "ml-pipeline.kubeflow.svc.cluster.local"
81+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
82+
value: "8887"
6883
image: ghcr.io/kubeflow/kfp-driver
6984
name: ""
7085
resources:
@@ -130,6 +145,10 @@ spec:
130145
valueFrom:
131146
fieldRef:
132147
fieldPath: metadata.uid
148+
- name: ML_PIPELINE_SERVICE_HOST
149+
value: "ml-pipeline.kubeflow.svc.cluster.local"
150+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
151+
value: "8887"
133152
envFrom:
134153
- configMapRef:
135154
name: metadata-grpc-configmap
@@ -257,10 +276,25 @@ spec:
257276
- ''
258277
- --no_proxy
259278
- ''
279+
- --mlPipelineServiceTLSEnabled
280+
- "false"
281+
- --mlmd_server_address
282+
- "metadata-grpc-service"
283+
- --mlmd_server_port
284+
- "8080"
285+
- --metadataTLSEnabled
286+
- "false"
287+
- --ca_cert_path
288+
- ""
260289
- --cache_disabled
261290
- 'true'
262291
command:
263292
- driver
293+
env:
294+
- name: ML_PIPELINE_SERVICE_HOST
295+
value: "ml-pipeline.kubeflow.svc.cluster.local"
296+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
297+
value: "8887"
264298
image: ghcr.io/kubeflow/kfp-driver
265299
name: ""
266300
resources:

‎backend/src/v2/compiler/argocompiler/testdata/hello_world_with_retry.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ spec:
263263
valueFrom:
264264
fieldRef:
265265
fieldPath: metadata.uid
266+
- name: ML_PIPELINE_SERVICE_HOST
267+
value: ml-pipeline.kubeflow.svc.cluster.local
268+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
269+
value: '8887'
266270
envFrom:
267271
- configMapRef:
268272
name: metadata-grpc-configmap

‎backend/src/v2/compiler/argocompiler/testdata/hello_world_with_retry_all_args.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,23 @@ spec:
6161
- ""
6262
- --no_proxy
6363
- ""
64+
- --mlPipelineServiceTLSEnabled
65+
- "false"
66+
- --mlmd_server_address
67+
- "metadata-grpc-service"
68+
- --mlmd_server_port
69+
- "8080"
70+
- --metadataTLSEnabled
71+
- "false"
72+
- --ca_cert_path
73+
- ""
6474
command:
6575
- driver
76+
env:
77+
- name: ML_PIPELINE_SERVICE_HOST
78+
value: "ml-pipeline.kubeflow.svc.cluster.local"
79+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
80+
value: "8887"
6681
image: ghcr.io/kubeflow/kfp-driver
6782
name: ""
6883
resources:
@@ -144,6 +159,10 @@ spec:
144159
valueFrom:
145160
fieldRef:
146161
fieldPath: metadata.uid
162+
- name: ML_PIPELINE_SERVICE_HOST
163+
value: "ml-pipeline.kubeflow.svc.cluster.local"
164+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
165+
value: "8887"
147166
envFrom:
148167
- configMapRef:
149168
name: metadata-grpc-configmap
@@ -244,6 +263,10 @@ spec:
244263
valueFrom:
245264
fieldRef:
246265
fieldPath: metadata.uid
266+
- name: ML_PIPELINE_SERVICE_HOST
267+
value: "ml-pipeline.kubeflow.svc.cluster.local"
268+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
269+
value: "8887"
247270
envFrom:
248271
- configMapRef:
249272
name: metadata-grpc-configmap
@@ -399,8 +422,23 @@ spec:
399422
- ""
400423
- --no_proxy
401424
- ""
425+
- --mlPipelineServiceTLSEnabled
426+
- "false"
427+
- --mlmd_server_address
428+
- "metadata-grpc-service"
429+
- --mlmd_server_port
430+
- "8080"
431+
- --metadataTLSEnabled
432+
- "false"
433+
- --ca_cert_path
434+
- ""
402435
command:
403436
- driver
437+
env:
438+
- name: ML_PIPELINE_SERVICE_HOST
439+
value: "ml-pipeline.kubeflow.svc.cluster.local"
440+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
441+
value: "8887"
404442
image: ghcr.io/kubeflow/kfp-driver
405443
name: ""
406444
resources:

‎backend/src/v2/compiler/argocompiler/testdata/nested_pipeline_all_level_retry.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,23 @@ spec:
8080
- ""
8181
- --no_proxy
8282
- ""
83+
- --mlPipelineServiceTLSEnabled
84+
- "false"
85+
- --mlmd_server_address
86+
- "metadata-grpc-service"
87+
- --mlmd_server_port
88+
- "8080"
89+
- --metadataTLSEnabled
90+
- "false"
91+
- --ca_cert_path
92+
- ""
8393
command:
8494
- driver
95+
env:
96+
- name: ML_PIPELINE_SERVICE_HOST
97+
value: "ml-pipeline.kubeflow.svc.cluster.local"
98+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
99+
value: "8887"
85100
image: ghcr.io/kubeflow/kfp-driver
86101
name: ""
87102
resources:
@@ -161,6 +176,10 @@ spec:
161176
valueFrom:
162177
fieldRef:
163178
fieldPath: metadata.uid
179+
- name: ML_PIPELINE_SERVICE_HOST
180+
value: "ml-pipeline.kubeflow.svc.cluster.local"
181+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
182+
value: "8887"
164183
envFrom:
165184
- configMapRef:
166185
name: metadata-grpc-configmap
@@ -332,8 +351,23 @@ spec:
332351
- ""
333352
- --no_proxy
334353
- ""
354+
- --mlPipelineServiceTLSEnabled
355+
- "false"
356+
- --mlmd_server_address
357+
- "metadata-grpc-service"
358+
- --mlmd_server_port
359+
- "8080"
360+
- --metadataTLSEnabled
361+
- "false"
362+
- --ca_cert_path
363+
- ""
335364
command:
336365
- driver
366+
env:
367+
- name: ML_PIPELINE_SERVICE_HOST
368+
value: "ml-pipeline.kubeflow.svc.cluster.local"
369+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
370+
value: "8887"
337371
image: ghcr.io/kubeflow/kfp-driver
338372
name: ""
339373
resources:

‎backend/src/v2/compiler/argocompiler/testdata/nested_pipeline_pipeline_retry.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,23 @@ spec:
8080
- ""
8181
- --no_proxy
8282
- ""
83+
- --mlPipelineServiceTLSEnabled
84+
- "false"
85+
- --mlmd_server_address
86+
- "metadata-grpc-service"
87+
- --mlmd_server_port
88+
- "8080"
89+
- --metadataTLSEnabled
90+
- "false"
91+
- --ca_cert_path
92+
- ""
8393
command:
8494
- driver
95+
env:
96+
- name: ML_PIPELINE_SERVICE_HOST
97+
value: "ml-pipeline.kubeflow.svc.cluster.local"
98+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
99+
value: "8887"
85100
image: ghcr.io/kubeflow/kfp-driver
86101
name: ""
87102
resources:
@@ -161,6 +176,10 @@ spec:
161176
valueFrom:
162177
fieldRef:
163178
fieldPath: metadata.uid
179+
- name: ML_PIPELINE_SERVICE_HOST
180+
value: "ml-pipeline.kubeflow.svc.cluster.local"
181+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
182+
value: "8887"
164183
envFrom:
165184
- configMapRef:
166185
name: metadata-grpc-configmap
@@ -332,8 +351,23 @@ spec:
332351
- ""
333352
- --no_proxy
334353
- ""
354+
- --mlPipelineServiceTLSEnabled
355+
- "false"
356+
- --mlmd_server_address
357+
- "metadata-grpc-service"
358+
- --mlmd_server_port
359+
- "8080"
360+
- --metadataTLSEnabled
361+
- "false"
362+
- --ca_cert_path
363+
- ""
335364
command:
336365
- driver
366+
env:
367+
- name: ML_PIPELINE_SERVICE_HOST
368+
value: "ml-pipeline.kubeflow.svc.cluster.local"
369+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
370+
value: "8887"
337371
image: ghcr.io/kubeflow/kfp-driver
338372
name: ""
339373
resources:

‎backend/src/v2/compiler/argocompiler/testdata/nested_pipeline_sub_component_retry.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,23 @@ spec:
8080
- ""
8181
- --no_proxy
8282
- ""
83+
- --mlPipelineServiceTLSEnabled
84+
- "false"
85+
- --mlmd_server_address
86+
- "metadata-grpc-service"
87+
- --mlmd_server_port
88+
- "8080"
89+
- --metadataTLSEnabled
90+
- "false"
91+
- --ca_cert_path
92+
- ""
8393
command:
8494
- driver
95+
env:
96+
- name: ML_PIPELINE_SERVICE_HOST
97+
value: "ml-pipeline.kubeflow.svc.cluster.local"
98+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
99+
value: "8887"
85100
image: ghcr.io/kubeflow/kfp-driver
86101
name: ""
87102
resources:
@@ -145,6 +160,10 @@ spec:
145160
valueFrom:
146161
fieldRef:
147162
fieldPath: metadata.uid
163+
- name: ML_PIPELINE_SERVICE_HOST
164+
value: "ml-pipeline.kubeflow.svc.cluster.local"
165+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
166+
value: "8887"
148167
envFrom:
149168
- configMapRef:
150169
name: metadata-grpc-configmap
@@ -249,6 +268,10 @@ spec:
249268
valueFrom:
250269
fieldRef:
251270
fieldPath: metadata.uid
271+
- name: ML_PIPELINE_SERVICE_HOST
272+
value: "ml-pipeline.kubeflow.svc.cluster.local"
273+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
274+
value: "8887"
252275
envFrom:
253276
- configMapRef:
254277
name: metadata-grpc-configmap
@@ -412,8 +435,23 @@ spec:
412435
- ""
413436
- --no_proxy
414437
- ""
438+
- --mlPipelineServiceTLSEnabled
439+
- "false"
440+
- --mlmd_server_address
441+
- "metadata-grpc-service"
442+
- --mlmd_server_port
443+
- "8080"
444+
- --metadataTLSEnabled
445+
- "false"
446+
- --ca_cert_path
447+
- ""
415448
command:
416449
- driver
450+
env:
451+
- name: ML_PIPELINE_SERVICE_HOST
452+
value: "ml-pipeline.kubeflow.svc.cluster.local"
453+
- name: ML_PIPELINE_SERVICE_PORT_GRPC
454+
value: "8887"
417455
image: ghcr.io/kubeflow/kfp-driver
418456
name: ""
419457
resources:

0 commit comments

Comments
 (0)