chore: simplify upgrade templates (#4135)

pkg/engine/transform/transform_test.go

@@ -55,7 +55,7 @@ func TestNormalizeForK8sAddVMASPool(t *testing.T) {
 func TestNormalizeMasterResourcesForVMSSPoolUpgrade(t *testing.T) {
 	RegisterTestingT(t)
 	logger := logrus.New().WithField("testName", "TestNormalizeMasterResourcesForVMSSPoolUpgrade")
-	fileContents, e := ioutil.ReadFile("./transformtestfiles/k8s_template.json")
+	fileContents, e := ioutil.ReadFile("./transformtestfiles/k8s_slb_vmss_template.json")
 	Expect(e).To(BeNil())
 	expectedFileContents, e := ioutil.ReadFile("./transformtestfiles/k8s_vmss_pool_upgrade_template.json")
 	Expect(e).To(BeNil())
@@ -150,34 +150,6 @@ func TestRemoveKMSResourcesFromTemplate(t *testing.T) {
 	ValidateTemplate(templateMap, expectedFileContents, "TestRemoveKMSResourcesFromTemplate")
 }
 
-func TestNormalizeResourcesForK8sMasterUpgrade(t *testing.T) {
-	RegisterTestingT(t)
-	logger := logrus.New().WithField("testName", "TestNormalizeResourcesForK8sMasterUpgrade")
-	fileContents, e := ioutil.ReadFile("./transformtestfiles/k8s_template.json")
-	Expect(e).To(BeNil())
-	expectedFileContents, e := ioutil.ReadFile("./transformtestfiles/k8s_master_upgrade_template.json")
-	Expect(e).To(BeNil())
-	templateJSON := string(fileContents)
-	var template interface{}
-	e = json.Unmarshal([]byte(templateJSON), &template)
-	Expect(e).NotTo(HaveOccurred())
-	templateMap := template.(map[string]interface{})
-	transformer := &Transformer{
-		Translator: &i18n.Translator{
-			Locale: nil,
-		},
-	}
-	agentsToKeepMap := make(map[string]bool)
-	agentsToKeepMap["agentppol1"] = true // keep the typo or update the templates in ./transformtestfiles
-	agentsToKeepMap["agentpool2"] = true
-	// The usage of NormalizeResourcesForK8sMasterUpgrade across the code base seems to indicate that
-	// agentPoolsToPreserve == nil => master node upgrade
-	// so, maybe this test is not of much value
-	e = transformer.NormalizeResourcesForK8sMasterUpgrade(logger, templateMap, false, agentsToKeepMap)
-	Expect(e).To(BeNil())
-	ValidateTemplate(templateMap, expectedFileContents, "TestNormalizeResourcesForK8sMasterUpgrade")
-}
-
 func TestNormalizeResourcesForK8sAgentUpgrade(t *testing.T) {
 	RegisterTestingT(t)
 	logger := logrus.New().WithField("testName", "TestNormalizeResourcesForK8sAgentUpgrade")

pkg/engine/transform/transformtestfiles/k8s_agent_upgrade_template.json

@@ -1794,47 +1794,6 @@
         "typeHandlerVersion": "2.0"
       },
       "type": "Microsoft.Compute/virtualMachines/extensions"
-    },
-    {
-      "apiVersion": "[variables('apiVersionDefault')]",
-      "copy": {
-        "count": "[sub(variables('agentpool2Count'), variables('agentpool2Offset'))]",
-        "name": "loop"
-      },
-      "location": "[variables('location')]",
-      "name": "[concat(variables('agentpool2VMNamePrefix'), 'nic-', copyIndex(variables('agentpool2Offset')))]",
-      "properties": {
-        "enableIPForwarding": true,
-        "ipConfigurations": [
-          {
-            "name": "ipconfig1",
-            "properties": {
-              "primary": true,
-              "privateIPAllocationMethod": "Dynamic",
-              "subnet": {
-                "id": "[variables('agentpool2VnetSubnetID')]"
-              }
-            }
-          }
-        ]
-      },
-      "type": "Microsoft.Network/networkInterfaces"
-    },
-    {
-      "apiVersion": "[variables('apiVersionStorage')]",
-      "copy": {
-        "count": "[variables('agentpool2StorageAccountsCount')]",
-        "name": "loop"
-      },
-      "dependsOn": [
-        "[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
-      ],
-      "location": "[variables('location')]",
-      "name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
-      "properties": {
-        "accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
-      },
-      "type": "Microsoft.Storage/storageAccounts"
     }
   ]
 }