fixes 'ipName and zone are being written to app.yaml even when no pla…

…tform is specified' (kubeflow#2774)
StatCan · Mar 22, 2019 · 54fd247 · 54fd247
1 parent 7ef79bb
commit 54fd247
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bootstrap/cmd/kfctl/cmd/generate.go b/bootstrap/cmd/kfctl/cmd/generate.go
@@ -87,7 +87,7 @@ func init() {
 	}
 
 	// platform gcp
-	generateCmd.Flags().String(string(kftypes.ZONE), kftypes.DefaultZone,
+	generateCmd.Flags().String(string(kftypes.ZONE), "",
 		string(kftypes.ZONE)+" if '--platform gcp'")
 	bindErr = generateCfg.BindPFlag(string(kftypes.ZONE), generateCmd.Flags().Lookup(string(kftypes.ZONE)))
 	if bindErr != nil {

diff --git a/bootstrap/pkg/kfapp/coordinator/coordinator.go b/bootstrap/pkg/kfapp/coordinator/coordinator.go
@@ -299,7 +299,7 @@ func LoadKfApp(options map[string]interface{}) (kftypes.KfApp, error) {
 	}
 	if options[string(kftypes.IPNAME)] != nil && options[string(kftypes.IPNAME)].(string) != "" {
 		kfdef.Spec.IpName = options[string(kftypes.IPNAME)].(string)
-	} else if kfdef.Name != "" {
+	} else if kfdef.Spec.Platform == kftypes.GCP && kfdef.Name != "" {
 		kfdef.Spec.IpName = kfdef.Name + "-ip"
 	}
 	if options[string(kftypes.PROJECT)] != nil && options[string(kftypes.PROJECT)].(string) != "" {
@@ -312,7 +312,7 @@ func LoadKfApp(options map[string]interface{}) (kftypes.KfApp, error) {
 	}
 	if options[string(kftypes.ZONE)] != nil && options[string(kftypes.ZONE)].(string) != "" {
 		kfdef.Spec.Zone = options[string(kftypes.ZONE)].(string)
-	} else  {
+	} else if kfdef.Spec.Platform == kftypes.GCP {
 		kfdef.Spec.Zone = kftypes.DefaultZone
 	}
 	if options[string(kftypes.USE_BASIC_AUTH)] != nil {