fixes 'kfctl attribute deleteStorage is appearing in app.yaml when pl…

…atform is not gcp' (kubeflow#2827)
StatCan · Mar 27, 2019 · be71ab2 · be71ab2
1 parent 9475a2e
commit be71ab2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bootstrap/pkg/apis/apps/kfdef/v1alpha1/application_types.go b/bootstrap/pkg/apis/apps/kfdef/v1alpha1/application_types.go
@@ -35,7 +35,7 @@ type KfDefSpec struct {
 	SkipInitProject        bool   `json:"skipInitProject,omitempty"`
 	UseIstio               bool   `json:"useIstio"`
 	ServerVersion          string `json:"serverVersion,omitempty"`
-	DeleteStorage          bool   `json:"deleteStorage"`
+	DeleteStorage          bool   `json:"deleteStorage,omitempty"`
 }
 
 var DefaultRegistry = &RegistryConfig{

diff --git a/bootstrap/pkg/kfapp/coordinator/coordinator.go b/bootstrap/pkg/kfapp/coordinator/coordinator.go
@@ -364,7 +364,7 @@ func LoadKfApp(options map[string]interface{}) (kftypes.KfApp, error) {
 	if options[string(kftypes.MOUNT_LOCAL)] != nil {
 		kfdef.Spec.MountLocal = options[string(kftypes.MOUNT_LOCAL)].(bool)
 	}
-	if options[string(kftypes.DELETE_STORAGE)] != nil {
+	if options[string(kftypes.DELETE_STORAGE)] != nil && kfdef.Spec.Platform == kftypes.GCP {
 		kfdef.Spec.DeleteStorage = options[string(kftypes.DELETE_STORAGE)].(bool)
 	}
 	pApp := GetKfApp(kfdef)