refactor: standardize to "addons", deprecate "containeraddons"

pkg/engine/artifacts.go

@@ -21,7 +21,7 @@ type kubernetesComponentFileSpec struct {
 	isEnabled       bool   // is this spec enabled?
 }
 
-func kubernetesContainerAddonSettingsInit(p *api.Properties) map[string]kubernetesComponentFileSpec {
+func kubernetesAddonSettingsInit(p *api.Properties) map[string]kubernetesComponentFileSpec {
 	if p.OrchestratorProfile == nil {
 		p.OrchestratorProfile = &api.OrchestratorProfile{}
 	}

pkg/engine/artifacts_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 )
 
-func TestKubernetesContainerAddonSettingsInit(t *testing.T) {
+func TestKubernetesAddonSettingsInit(t *testing.T) {
 	/*
 		$ echo "Hello, World\!" | base64
 		SGVsbG8sIFdvcmxkXCEK
@@ -818,7 +818,7 @@ func TestKubernetesContainerAddonSettingsInit(t *testing.T) {
 		c := c
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
-			componentFileSpec := kubernetesContainerAddonSettingsInit(c.p)
+			componentFileSpec := kubernetesAddonSettingsInit(c.p)
 			for addon := range componentFileSpec {
 				switch addon {
 				case common.HeapsterAddonName:

pkg/engine/engine.go

@@ -766,10 +766,10 @@ func getClusterAutoscalerAddonFuncMap(addon api.KubernetesAddon, cs *api.Contain
 	}
 }
 
-func getContainerAddonsString(cs *api.ContainerService, sourcePath string) string {
+func getAddonsString(cs *api.ContainerService, sourcePath string) string {
 	properties := cs.Properties
 	var result string
-	settingsMap := kubernetesContainerAddonSettingsInit(properties)
+	settingsMap := kubernetesAddonSettingsInit(properties)
 
 	var addonNames []string
 

pkg/engine/template_generator.go

@@ -196,7 +196,7 @@ func (t *TemplateGenerator) GetMasterCustomDataJSONObject(cs *api.ContainerServi
 		customFilesReader,
 		"MASTER_CUSTOM_FILES_PLACEHOLDER")
 
-	addonStr := getContainerAddonsString(cs, "k8s/containeraddons")
+	addonStr := getAddonsString(cs, "k8s/addons")
 
 	str = strings.Replace(str, "MASTER_CONTAINER_ADDONS_PLACEHOLDER", addonStr, -1)