From 5f4468c0a76f0f4c6af977e6f3e0e0265c983f11 Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Wed, 23 Oct 2024 14:42:17 -0300 Subject: [PATCH] UPSTREAM: : Fixed importer component when podToPodTLS is true Signed-off-by: Helber Belmiro --- backend/src/v2/compiler/argocompiler/importer.go | 2 ++ backend/src/v2/compiler/argocompiler/testdata/importer.yaml | 2 ++ backend/src/v2/metadata/client.go | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/v2/compiler/argocompiler/importer.go b/backend/src/v2/compiler/argocompiler/importer.go index e84c2d673b1..2b49b09fc14 100644 --- a/backend/src/v2/compiler/argocompiler/importer.go +++ b/backend/src/v2/compiler/argocompiler/importer.go @@ -17,6 +17,7 @@ package argocompiler import ( "fmt" "github.com/kubeflow/pipelines/backend/src/apiserver/common" + "strconv" wfapi "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1" "github.com/kubeflow/pipelines/api/v2alpha1/go/pipelinespec" @@ -79,6 +80,7 @@ func (c *workflowCompiler) addImporterTemplate() string { fmt.Sprintf("$(%s)", component.EnvPodUID), "--mlmd_server_address", common.GetMetadataGrpcServiceServiceHost(), "--mlmd_server_port", common.GetMetadataGrpcServiceServicePort(), + "--metadataTLSEnabled", strconv.FormatBool(common.GetMetadataTLSEnabled()), } importerTemplate := &wfapi.Template{ Name: name, diff --git a/backend/src/v2/compiler/argocompiler/testdata/importer.yaml b/backend/src/v2/compiler/argocompiler/testdata/importer.yaml index 781b5be9006..9651dad2449 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/importer.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/importer.yaml @@ -41,6 +41,8 @@ spec: - "metadata-grpc-service" - --mlmd_server_port - "8080" + - --metadataTLSEnabled + - "false" command: - launcher-v2 env: diff --git a/backend/src/v2/metadata/client.go b/backend/src/v2/metadata/client.go index df321b71af8..cf745d1f3ae 100644 --- a/backend/src/v2/metadata/client.go +++ b/backend/src/v2/metadata/client.go @@ -120,7 +120,9 @@ func NewClient(serverAddress, serverPort string, tlsEnabled bool) (*Client, erro creds := insecure.NewCredentials() if tlsEnabled { - config := &tls.Config{} + config := &tls.Config{ + InsecureSkipVerify: true, // This should be removed by https://issues.redhat.com/browse/RHOAIENG-13871 + } creds = credentials.NewTLS(config) }