Add linux side custom bootstrap url to vlabs api

Azure · Dec 19, 2017 · 22148a6 · 22148a6
1 parent 82af0c1
commit 22148a6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -711,6 +711,9 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s
 			if properties.OrchestratorProfile.DcosConfig.DcosWindowsBootstrapURL != "" {
 				dcosWindowsBootstrapURL = properties.OrchestratorProfile.DcosConfig.DcosWindowsBootstrapURL
 			}
+			if properties.OrchestratorProfile.DcosConfig.DcosBootstrapURL != "" {
+				dcosBootstrapURL = properties.OrchestratorProfile.DcosConfig.DcosBootstrapURL
+			}
 		}
 
 		addValue(parametersMap, "dcosBootstrapURL", dcosBootstrapURL)

diff --git a/pkg/api/converterfromapi.go b/pkg/api/converterfromapi.go
@@ -638,6 +638,7 @@ func convertOrchestratorProfileToVLabs(api *OrchestratorProfile, o *vlabs.Orches
 }
 
 func convertDcosConfigToVLabs(api *DcosConfig, vlabs *vlabs.DcosConfig) {
+	vlabs.DcosBootstrapURL = api.DcosBootstrapURL
 	vlabs.DcosWindowsBootstrapURL = api.DcosWindowsBootstrapURL
 }
 

diff --git a/pkg/api/convertertoapi.go b/pkg/api/convertertoapi.go
@@ -582,6 +582,7 @@ func convertVLabsOrchestratorProfile(vp *vlabs.Properties, api *OrchestratorProf
 }
 
 func convertVLabsDcosConfig(vlabs *vlabs.DcosConfig, api *DcosConfig) {
+	api.DcosBootstrapURL = vlabs.DcosBootstrapURL
 	api.DcosWindowsBootstrapURL = vlabs.DcosWindowsBootstrapURL
 }
 

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -221,6 +221,7 @@ type KubernetesConfig struct {
 
 // DcosConfig Configuration for DC/OS
 type DcosConfig struct {
+	DcosBootstrapURL        string `json:"dcosBootstrapURL,omitempty"`
 	DcosWindowsBootstrapURL string `json:"dcosWindowsBootstrapURL,omitempty"`
 }
 

diff --git a/pkg/api/vlabs/types.go b/pkg/api/vlabs/types.go
@@ -239,6 +239,7 @@ type KubernetesConfig struct {
 
 // DcosConfig Configuration for DC/OS
 type DcosConfig struct {
+	DcosBootstrapURL        string `json:"dcosBootstrapURL,omitempty"`
 	DcosWindowsBootstrapURL string `json:"dcosWindowsBootstrapURL,omitempty"`
 }
 

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -46,6 +46,11 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 		t.Errorf("should error when DcosConfig populated for non-Kubernetes OrchestratorType")
 	}
 
+	o.DcosConfig.DcosBootstrapURL = "http://www.microsoft.com"
+	if err := o.Validate(false); err == nil {
+		t.Errorf("should error when DcosConfig populated for non-Kubernetes OrchestratorType")
+	}
+
 	o = &OrchestratorProfile{
 		OrchestratorType:    "Kubernetes",
 		OrchestratorVersion: "1.7.3",
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     func convertDcosConfigToVLabs(api *DcosConfig, vlabs *vlabs.DcosConfig) {
+    	vlabs.DcosBootstrapURL = api.DcosBootstrapURL
     	vlabs.DcosWindowsBootstrapURL = api.DcosWindowsBootstrapURL
     }
@@ Expand Down @@