Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

fix: Rename acsengineVersion tag to aksEngineVersion #264

Merged
merged 1 commit into from
Jan 10, 2019
Merged

fix: Rename acsengineVersion tag to aksEngineVersion #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/kubernetes/deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ az vm show -g <resource group of cluster> -n <name of Master or agent VM> --quer

```json
{
"acsengineVersion": "v0.15.0",
"aksEngineVersion": "v0.15.0",
"creationSource": "acsengine-k8s-master-22116803-0",
"orchestrator": "Kubernetes:1.9.5",
"poolName": "master",
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/kubernetesagentresourcesvmas.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"creationSource" : "[concat(parameters('generatorCode'), '-', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"resourceNameSuffix" : "[parameters('nameSuffix')]",
"orchestrator" : "[variables('orchestratorNameVersionTag')]",
"acsengineVersion" : "[parameters('acsengineVersion')]",
"aksEngineVersion" : "[parameters('aksEngineVersion')]",
"poolName" : "{{.Name}}"
},
"location": "[variables('location')]",
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/kubernetesmasterresources.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@
"creationSource" : "[concat(parameters('generatorCode'), '-', variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')))]",
"resourceNameSuffix" : "[parameters('nameSuffix')]",
"orchestrator" : "[variables('orchestratorNameVersionTag')]",
"acsengineVersion" : "[parameters('acsengineVersion')]",
"aksEngineVersion" : "[parameters('aksEngineVersion')]",
"poolName" : "master"
},
"location": "[variables('location')]",
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/kubernetesmasterresourcesvmss.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
"creationSource": "[concat(parameters('generatorCode'), '-', variables('masterVMNamePrefix'), 'vmss')]",
"resourceNameSuffix": "[parameters('nameSuffix')]",
"orchestrator": "[variables('orchestratorNameVersionTag')]",
"acsengineVersion" : "[parameters('acsengineVersion')]",
"aksEngineVersion" : "[parameters('aksEngineVersion')]",
"poolName": "master"
},
"location": "[variables('location')]",
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/kuberneteswinagentresourcesvmas.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"creationSource" : "[concat(parameters('generatorCode'), '-', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"resourceNameSuffix" : "[variables('winResourceNamePrefix')]",
"orchestrator" : "[variables('orchestratorNameVersionTag')]",
"acsengineVersion" : "[parameters('acsengineVersion')]",
"aksEngineVersion" : "[parameters('aksEngineVersion')]",
"poolName" : "{{.Name}}"
},
"location": "[variables('location')]",
Expand Down
2 changes: 1 addition & 1 deletion parts/masterparams.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"type": "string"
},
"acsengineVersion": {
"aksEngineVersion": {
"metadata": {
"description": "Contains details of the aks-engine version which was used to provision the cluster"
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/engine/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"github.com/Azure/aks-engine/pkg/helpers"
)

func getParameters(cs *api.ContainerService, generatorCode string, acsengineVersion string) (paramsMap, error) {
func getParameters(cs *api.ContainerService, generatorCode string, aksEngineVersion string) (paramsMap, error) {
properties := cs.Properties
location := cs.Location
parametersMap := paramsMap{}
cloudSpecConfig := cs.GetCloudSpecConfig()

// acsengine Parameters
addValue(parametersMap, "acsengineVersion", acsengineVersion)
addValue(parametersMap, "aksEngineVersion", aksEngineVersion)

// Master Parameters
addValue(parametersMap, "location", location)
Expand Down
4 changes: 2 additions & 2 deletions pkg/engine/template_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func InitializeTemplateGenerator(ctx Context) (*TemplateGenerator, error) {
}

// GenerateTemplate generates the template from the API Model
func (t *TemplateGenerator) GenerateTemplate(containerService *api.ContainerService, generatorCode string, acsengineVersion string) (templateRaw string, parametersRaw string, err error) {
func (t *TemplateGenerator) GenerateTemplate(containerService *api.ContainerService, generatorCode string, aksEngineVersion string) (templateRaw string, parametersRaw string, err error) {
// named return values are used in order to set err in case of a panic
templateRaw = ""
parametersRaw = ""
Expand Down Expand Up @@ -100,7 +100,7 @@ func (t *TemplateGenerator) GenerateTemplate(containerService *api.ContainerServ
templateRaw = b.String()

var parametersMap paramsMap
if parametersMap, err = getParameters(containerService, generatorCode, acsengineVersion); err != nil {
if parametersMap, err = getParameters(containerService, generatorCode, aksEngineVersion); err != nil {
return templateRaw, parametersRaw, err
}

Expand Down
10 changes: 5 additions & 5 deletions pkg/operations/kubernetesupgrade/upgradecluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const MasterPoolName = "master"

// UpgradeCluster runs the workflow to upgrade a Kubernetes cluster.
func (uc *UpgradeCluster) UpgradeCluster(subscriptionID uuid.UUID, az armhelpers.AKSEngineClient, kubeConfig, resourceGroup string,
cs *api.ContainerService, nameSuffix string, agentPoolsToUpgrade []string, acsengineVersion string) error {
cs *api.ContainerService, nameSuffix string, agentPoolsToUpgrade []string, aksEngineVersion string) error {
uc.ClusterTopology = ClusterTopology{}
uc.SubscriptionID = subscriptionID.String()
uc.ResourceGroup = resourceGroup
Expand All @@ -104,17 +104,17 @@ func (uc *UpgradeCluster) UpgradeCluster(subscriptionID uuid.UUID, az armhelpers
switch {
case strings.HasPrefix(upgradeVersion, "1.6."):
upgrader16 := &Kubernetes16upgrader{}
upgrader16.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
upgrader16.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, aksEngineVersion)
upgrader = upgrader16

case strings.HasPrefix(upgradeVersion, "1.7."):
upgrader17 := &Kubernetes17upgrader{}
upgrader17.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
upgrader17.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, aksEngineVersion)
upgrader = upgrader17

case strings.HasPrefix(upgradeVersion, "1.8."):
upgrader18 := &Kubernetes18upgrader{}
upgrader18.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
upgrader18.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, aksEngineVersion)
upgrader = upgrader18

case strings.HasPrefix(upgradeVersion, "1.9."),
Expand All @@ -123,7 +123,7 @@ func (uc *UpgradeCluster) UpgradeCluster(subscriptionID uuid.UUID, az armhelpers
strings.HasPrefix(upgradeVersion, "1.12."),
strings.HasPrefix(upgradeVersion, "1.13."):
u := &Upgrader{}
u.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
u.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, aksEngineVersion)
upgrader = u

default:
Expand Down
8 changes: 4 additions & 4 deletions pkg/operations/kubernetesupgrade/upgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ type vmInfo struct {
}

// Init initializes an upgrader struct
func (ku *Upgrader) Init(translator *i18n.Translator, logger *logrus.Entry, clusterTopology ClusterTopology, client armhelpers.AKSEngineClient, kubeConfig string, stepTimeout *time.Duration, acsEngineVersion string) {
func (ku *Upgrader) Init(translator *i18n.Translator, logger *logrus.Entry, clusterTopology ClusterTopology, client armhelpers.AKSEngineClient, kubeConfig string, stepTimeout *time.Duration, aksEngineVersion string) {
ku.Translator = translator
ku.logger = logger
ku.ClusterTopology = clusterTopology
ku.Client = client
ku.kubeConfig = kubeConfig
ku.stepTimeout = stepTimeout
ku.AKSEngineVersion = acsEngineVersion
ku.AKSEngineVersion = aksEngineVersion
}

// RunUpgrade runs the upgrade pipeline
Expand Down Expand Up @@ -524,7 +524,7 @@ func (ku *Upgrader) upgradeAgentScaleSets(ctx context.Context) error {
return nil
}

func (ku *Upgrader) generateUpgradeTemplate(upgradeContainerService *api.ContainerService, acsengineVersion string) (map[string]interface{}, map[string]interface{}, error) {
func (ku *Upgrader) generateUpgradeTemplate(upgradeContainerService *api.ContainerService, aksEngineVersion string) (map[string]interface{}, map[string]interface{}, error) {
var err error
ctx := engine.Context{
Translator: ku.Translator,
Expand All @@ -542,7 +542,7 @@ func (ku *Upgrader) generateUpgradeTemplate(upgradeContainerService *api.Contain

var templateJSON string
var parametersJSON string
if templateJSON, parametersJSON, err = templateGenerator.GenerateTemplate(upgradeContainerService, engine.DefaultGeneratorCode, acsengineVersion); err != nil {
if templateJSON, parametersJSON, err = templateGenerator.GenerateTemplate(upgradeContainerService, engine.DefaultGeneratorCode, aksEngineVersion); err != nil {
return nil, nil, ku.Translator.Errorf("error generating upgrade template: %s", err.Error())
}

Expand Down