removed datadisk to allow scale after upgrade (#3482)

Azure · Jul 24, 2018 · 271a58c · 271a58c
1 parent 7448f69
commit 271a58c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/pkg/acsengine/transform/transform.go b/pkg/acsengine/transform/transform.go
@@ -299,7 +299,7 @@ func (t *Transformer) NormalizeMasterResourcesForScaling(logger *logrus.Entry, t
 			delete(hardwareProfile, vmSizeFieldName)
 		}
 
-		if !t.removeCustomData(logger, resourceProperties) || !t.removeImageReference(logger, resourceProperties) {
+		if !t.removeCustomData(logger, resourceProperties) || !t.removeDataDisks(logger, resourceProperties) || !t.removeImageReference(logger, resourceProperties) {
 			continue
 		}
 	}
@@ -321,6 +321,19 @@ func (t *Transformer) removeCustomData(logger *logrus.Entry, resourceProperties
 	return ok
 }
 
+func (t *Transformer) removeDataDisks(logger *logrus.Entry, resourceProperties map[string]interface{}) bool {
+	storageProfile, ok := resourceProperties[storageProfileFieldName].(map[string]interface{})
+	if !ok {
+		logger.Warnf("Template improperly formatted. Could not find: %s", storageProfileFieldName)
+		return ok
+	}
+
+	if storageProfile[dataDisksFieldName] != nil {
+		delete(storageProfile, dataDisksFieldName)
+	}
+	return ok
+}
+
 func (t *Transformer) removeImageReference(logger *logrus.Entry, resourceProperties map[string]interface{}) bool {
 	storageProfile, ok := resourceProperties[storageProfileFieldName].(map[string]interface{})
 	if !ok {

diff --git a/pkg/acsengine/transform/transformtestfiles/k8s_agent_upgrade_template.json b/pkg/acsengine/transform/transformtestfiles/k8s_agent_upgrade_template.json
@@ -1991,14 +1991,6 @@
           }
         },
         "storageProfile": {
-          "dataDisks": [
-            {
-              "createOption": "attach",
-              "diskSizeGB": "128",
-              "lun": 0,
-              "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')),'-etcddisk')]"
-            }
-          ],
           "osDisk": {
             "caching": "ReadWrite",
             "createOption": "FromImage"

diff --git a/pkg/acsengine/transform/transformtestfiles/k8s_scale_template.json b/pkg/acsengine/transform/transformtestfiles/k8s_scale_template.json
@@ -2173,14 +2173,6 @@
           }
         },
         "storageProfile": {
-          "dataDisks": [
-            {
-              "createOption": "Empty",
-              "diskSizeGB": "128",
-              "lun": 0,
-              "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')),'-etcddisk')]"
-            }
-          ],
           "osDisk": {
             "caching": "ReadWrite",
             "createOption": "FromImage"

diff --git a/pkg/acsengine/transform/transformtestfiles/k8s_vnet_scale_template.json b/pkg/acsengine/transform/transformtestfiles/k8s_vnet_scale_template.json
@@ -2117,14 +2117,6 @@
           }
         },
         "storageProfile": {
-          "dataDisks": [
-            {
-              "createOption": "Empty",
-              "diskSizeGB": "128",
-              "lun": 0,
-              "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')),'-etcddisk')]"
-            }
-          ],
           "osDisk": {
             "caching": "ReadWrite",
             "createOption": "FromImage"