Moved openshift scripts under parts/opesnhift (#2746)

Azure · Apr 23, 2018 · 0c62206 · 0c62206
1 parent 8677e78
commit 0c62206
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 33 deletions.
diff --git a/parts/k8s/openshiftmasterscript.sh → parts/openshift/openshiftmasterscript.sh b/parts/k8s/openshiftmasterscript.sh → parts/openshift/openshiftmasterscript.sh
diff --git a/parts/k8s/openshiftnodescript.sh → parts/openshift/openshiftnodescript.sh b/parts/k8s/openshiftnodescript.sh → parts/openshift/openshiftnodescript.sh
diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -40,8 +40,8 @@ const (
 	kubeConfigJSON                           = "k8s/kubeconfig.json"
 	kubernetesWindowsAgentCustomDataPS1      = "k8s/kuberneteswindowssetup.ps1"
 	// OpenShift custom scripts
-	openshiftNodeScript   = "k8s/openshiftnodescript.sh"
-	openshiftMasterScript = "k8s/openshiftmasterscript.sh"
+	openshiftNodeScript   = "openshift/openshiftnodescript.sh"
+	openshiftMasterScript = "openshift/openshiftmasterscript.sh"
 )
 
 const (
@@ -1746,7 +1746,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			return helpers.IsTrueBoolPointer(cs.Properties.OrchestratorProfile.KubernetesConfig.EnablePodSecurityPolicy)
 		},
 		"OpenShiftGetMasterSh": func() string {
-			tb := MustAsset("k8s/openshiftmasterscript.sh")
+			tb := MustAsset("openshift/openshiftmasterscript.sh")
 			t := template.Must(template.New("master").Parse(string(tb)))
 			b := &bytes.Buffer{}
 			t.Execute(b, struct {
@@ -1763,7 +1763,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			return b.String()
 		},
 		"OpenShiftGetNodeSh": func(profile *api.AgentPoolProfile) string {
-			tb := MustAsset("k8s/openshiftnodescript.sh")
+			tb := MustAsset("openshift/openshiftnodescript.sh")
 			t := template.Must(template.New("node").Parse(string(tb)))
 			b := &bytes.Buffer{}
 			t.Execute(b, struct {