Merge pull request kubeflow#92 from HumairAK/stable

[Cherry-Pick] UPSTREAM: <carry>: Fixed importer component when podToPodTLS is true
HumairAK · Oct 24, 2024 · 3ae9ea6 · 3ae9ea6
2 parents c6f3ec1 + 5f4468c
commit 3ae9ea6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)
 	}