Made MetadataTLSEnabled optional

Signed-off-by: hbelmiro <[email protected]>
opendatahub-io · Sep 6, 2024 · b726e8b · b726e8b
1 parent 09a698f
commit b726e8b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/backend/src/apiserver/common/config.go b/backend/src/apiserver/common/config.go
@@ -64,17 +64,6 @@ func GetMapConfig(configName string) map[string]string {
 	return viper.GetStringMapString(configName)
 }
 
-func GetBoolConfig(configName string) bool {
-	if !viper.IsSet(configName) {
-		glog.Fatalf("Please specify flag %s", configName)
-	}
-	value, err := strconv.ParseBool(viper.GetString(configName))
-	if err != nil {
-		glog.Fatalf("Failed converting string to bool %s", viper.GetString(configName))
-	}
-	return value
-}
-
 func GetBoolConfigWithDefault(configName string, value bool) bool {
 	if !viper.IsSet(configName) {
 		return value
@@ -156,5 +145,5 @@ func GetSignedURLExpiryTimeSeconds() int {
 }
 
 func GetMetadataTLSEnabled() bool {
-	return GetBoolConfig(MetadataTLSEnabled)
+	return GetBoolConfigWithDefault(MetadataTLSEnabled, DefaultMetadataTLSEnabled)
 }
diff --git a/backend/src/apiserver/common/const.go b/backend/src/apiserver/common/const.go
@@ -57,6 +57,7 @@ const DefaultTokenReviewAudience string = "pipelines.kubeflow.org"
 const (
 	DefaultMetadataGrpcServiceServiceHost = "metadata-grpc-service"
 	DefaultMetadataGrpcServiceServicePort = "8080"
+	DefaultMetadataTLSEnabled             = false
 )
 
 const (

diff --git a/backend/src/v2/cmd/driver/main.go b/backend/src/v2/cmd/driver/main.go
@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/pkg/errors"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -71,7 +70,7 @@ var (
 	conditionPath      = flag.String("condition_path", "", "Condition output path")
 
 	mlPipelineServiceTLSEnabledStr = flag.String("mlPipelineServiceTLSEnabled", "false", "Set to 'true' if mlpipeline api server serves over TLS (default: 'false').")
-	metadataTLSEnabledStr          = flag.String("metadataTLSEnabled", "", "Set to 'true' if metadata server serves over TLS.")
+	metadataTLSEnabledStr          = flag.String("metadataTLSEnabled", "false", "Set to 'true' if metadata server serves over TLS (default: 'false').")
 )
 
 // func RootDAG(pipelineName string, runID string, component *pipelinespec.ComponentSpec, task *pipelinespec.PipelineTaskSpec, mlmd *metadata.Client) (*Execution, error) {
@@ -156,9 +155,6 @@ func drive() (err error) {
 		return err
 	}
 
-	if *metadataTLSEnabledStr == "" {
-		return errors.New("--metadataTLSEnabled is mandatory")
-	}
 	metadataTLSEnabled, err := strconv.ParseBool(*metadataTLSEnabledStr)
 	if err != nil {
 		return err
@@ -306,9 +302,6 @@ func newMlmdClient() (*metadata.Client, error) {
 		mlmdConfig.Port = *mlmdServerPort
 	}
 
-	if *metadataTLSEnabledStr == "" {
-		return nil, errors.New("--metadataTLSEnabled is mandatory")
-	}
 	tlsEnabled, err := strconv.ParseBool(*metadataTLSEnabledStr)
 	if err != nil {
 		return nil, err

diff --git a/backend/src/v2/cmd/launcher-v2/main.go b/backend/src/v2/cmd/launcher-v2/main.go
@@ -17,7 +17,6 @@ package main
 
 import (
 	"context"
-	"errors"
 	"flag"
 	"fmt"
 	"strconv"
@@ -44,7 +43,7 @@ var (
 	mlmdServerAddress              = flag.String("mlmd_server_address", "", "The MLMD gRPC server address.")
 	mlmdServerPort                 = flag.String("mlmd_server_port", "8080", "The MLMD gRPC server port.")
 	mlPipelineServiceTLSEnabledStr = flag.String("mlPipelineServiceTLSEnabled", "false", "Set to 'true' if mlpipeline api server serves over TLS (default: 'false').")
-	metadataTLSEnabledStr          = flag.String("metadataTLSEnabled", "", "Set to 'true' if metadata server serves over TLS (default: 'false').")
+	metadataTLSEnabledStr          = flag.String("metadataTLSEnabled", "false", "Set to 'true' if metadata server serves over TLS (default: 'false').")
 )
 
 func main() {
@@ -74,9 +73,6 @@ func run() error {
 		return err
 	}
 
-	if *metadataTLSEnabledStr == "" {
-		return errors.New("--metadataTLSEnabled is mandatory")
-	}
 	metadataServiceTLSEnabled, err := strconv.ParseBool(*metadataTLSEnabledStr)
 	if err != nil {
 		return err