store non exist parameter differently (kubeflow#2625)

StatCan · Mar 6, 2019 · 3bbfd95 · 3bbfd95
1 parent a583626
commit 3bbfd95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/bootstrap/cmd/bootstrap/app/ksServer.go b/bootstrap/cmd/bootstrap/app/ksServer.go
@@ -750,7 +750,7 @@ func (s *ksServer) appGenerate(kfApp kApp.App, appConfig *kstypes.AppConfig) err
 		}
 	}
 	// Apply Params
-	for _, p := range appConfig.Parameters {
+	for _, p := range appConfig.ApplyParameters {
 		err = actions.RunParamSet(map[string]interface{}{
 			actions.OptionAppRoot: kfApp.Root(),
 			actions.OptionName:    p.Component,
@@ -1296,14 +1296,14 @@ func makeDeployEndpoint(svc KsService) endpoint.Endpoint {
 				r.Err = err.Error()
 				return r, err
 			}
-			req.AppConfig.Parameters = append(
-				req.AppConfig.Parameters,
+			req.AppConfig.ApplyParameters = append(
+				req.AppConfig.ApplyParameters,
 				kstypes.KsParameter{
 					Component: "pipeline",
 					Name:      "mysqlPd",
 					Value:     req.Name + StorageDmSpec.DmNameSuffix + MetadataStoreDiskSuffix})
-			req.AppConfig.Parameters = append(
-				req.AppConfig.Parameters,
+			req.AppConfig.ApplyParameters = append(
+				req.AppConfig.ApplyParameters,
 				kstypes.KsParameter{
 					Component: "pipeline",
 					Name:      "minioPd",

diff --git a/bootstrap/pkg/apis/apps/ksonnet/v1alpha1/application_types.go b/bootstrap/pkg/apis/apps/ksonnet/v1alpha1/application_types.go
@@ -188,10 +188,12 @@ type RegistriesConfigFile struct {
 }
 
 type AppConfig struct {
-	Registries []*RegistryConfig `json:"registries,omitempty"`
-	Packages   []KsPackage       `json:"packages,omitempty"`
-	Components []KsComponent     `json:"components,omitempty"`
-	Parameters []KsParameter     `json:"parameters,omitempty"`
+	Registries      []*RegistryConfig `json:"registries,omitempty"`
+	Packages        []KsPackage       `json:"packages,omitempty"`
+	Components      []KsComponent     `json:"components,omitempty"`
+	Parameters      []KsParameter     `json:"parameters,omitempty"`
+	// Parameters to apply when creating the ksonnet components
+	ApplyParameters []KsParameter     `json:"applyParameters,omitempty"`
 }
 
 type NameValue struct {
@@ -250,7 +252,7 @@ type Ksonnet struct {
 type KsAppList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Ksonnet `json:"items"`
+	Items []Ksonnet `json:"items"`
 }
 
 func init() {