From 384f6a83bb18f2b5628bd22108d454210334f461 Mon Sep 17 00:00:00 2001 From: Andrey Melnikov Date: Thu, 5 Aug 2021 10:21:49 -0700 Subject: [PATCH 1/2] fix: rename serving flag to indicate it is for model serving in general --- cmd/init.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/init.go b/cmd/init.go index c3c52bf..e60c5f1 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -35,7 +35,7 @@ var ( EnableHTTPS bool EnableCertManager bool EnableMetalLb bool - EnableKFServing bool + DisableServing bool Database bool GPUDevicePlugins []string Services []string @@ -211,7 +211,7 @@ var initCmd = &cobra.Command{ } } - if EnableKFServing { + if !DisableServing { if err := bld.AddComponent("kfserving"); err != nil { log.Printf("[error] Adding component kfserving %v", err.Error()) return @@ -347,7 +347,7 @@ func init() { initCmd.Flags().StringSliceVarP(&GPUDevicePlugins, "gpu-device-plugins", "", nil, "Install NVIDIA and/or AMD gpu device plugins. Valid values can be comma separated and are: amd, nvidia") initCmd.Flags().StringSliceVarP(&Services, "services", "", nil, "Install additional services. Valid values can be comma separated and are: modeldb") initCmd.Flags().BoolVarP(&Database, "database", "", false, "Use a pre-existing database, set up configuration in params.yaml") - initCmd.Flags().BoolVarP(&EnableKFServing, "enable-kfserving", "", false, "Enable KFServing and Knative") + initCmd.Flags().BoolVarP(&DisableServing, "disable-serving", "", false, "Disable model serving") } func validateInput() error { From d0d5873d8162dd7f3eca0210b888d3f2e47e4521 Mon Sep 17 00:00:00 2001 From: Andrey Melnikov Date: Thu, 5 Aug 2021 15:56:25 -0700 Subject: [PATCH 2/2] fix: update cli to print sys-storage url on microk8s --- util/kubectl.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/util/kubectl.go b/util/kubectl.go index 42543e4..619162c 100644 --- a/util/kubectl.go +++ b/util/kubectl.go @@ -294,7 +294,18 @@ func PrintClusterNetworkInformation(c *kubernetes.Clientset, url string) { } dnsRecordMessage = "local" - fmt.Printf("\nIn your %v file, add %v and point it to %v\n", hostsPath, clusterIP, fqdn) + fmt.Printf("\nIn your %v file, add\n", hostsPath) + fmt.Printf(" %v %v\n", clusterIP, fqdn) + + if config.Spec.HasLikeComponent("kfserving") { + domain := yamlFile.GetValue("application.domain").Value + defaultNamespace := yamlFile.GetValue("application.defaultNamespace").Value + modelServingURL := fmt.Sprintf("sys-storage-%v.%v", defaultNamespace, domain) + + fmt.Printf(" %v %v\n", clusterIP, modelServingURL) + } + + fmt.Println() } else { dnsRecordMessage = "an A" if !IsIpv4(clusterIP) {