Merge pull request #10264 from openshift-cherrypick-robot/cherry-pick-10179-to-release-4.17

openshift-merge-bot[bot] · web-flow · commit 4483ecd0691b · 2026-01-30T22:46:58.000Z
[release-4.17] OCPBUGS-74555: Azure UPI ARM template: use storageAccountId
diff --git a/upi/azure/02_storage.json b/upi/azure/02_storage.json
@@ -68,7 +68,7 @@
           },
           "resources": [
             {
-              "apiVersion": "2021-10-01",
+              "apiVersion": "2022-03-03",
               "type": "versions",
               "name": "[variables('imageRelease')]",
               "location": "[variables('location')]",
@@ -88,7 +88,7 @@
                 "storageProfile": {
                   "osDiskImage": {
                     "source": {
-                      "id": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",
+                      "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",
                       "uri": "[parameters('vhdBlobURL')]"
                     }
                   }
@@ -118,7 +118,7 @@
           },
           "resources": [
             {
-              "apiVersion": "2021-10-01",
+              "apiVersion": "2022-03-03",
               "type": "versions",
               "name": "[variables('imageRelease')]",
               "location": "[variables('location')]",
@@ -138,7 +138,7 @@
                 "storageProfile": {
                   "osDiskImage": {
                     "source": {
-                      "id": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",
+                      "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",
                       "uri": "[parameters('vhdBlobURL')]"
                     }
                   }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`},`
`69`	`69`	`"resources": [`
`70`	`70`	`{`
`71`		`- "apiVersion": "2021-10-01",`
	`71`	`+ "apiVersion": "2022-03-03",`
`72`	`72`	`"type": "versions",`
`73`	`73`	`"name": "[variables('imageRelease')]",`
`74`	`74`	`"location": "[variables('location')]",`
`@@ -88,7 +88,7 @@`
`88`	`88`	`"storageProfile": {`
`89`	`89`	`"osDiskImage": {`
`90`	`90`	`"source": {`
`91`		`- "id": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",`
	`91`	`+ "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",`
`92`	`92`	`"uri": "[parameters('vhdBlobURL')]"`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -118,7 +118,7 @@`
`118`	`118`	`},`
`119`	`119`	`"resources": [`
`120`	`120`	`{`
`121`		`- "apiVersion": "2021-10-01",`
	`121`	`+ "apiVersion": "2022-03-03",`
`122`	`122`	`"type": "versions",`
`123`	`123`	`"name": "[variables('imageRelease')]",`
`124`	`124`	`"location": "[variables('location')]",`
`@@ -138,7 +138,7 @@`
`138`	`138`	`"storageProfile": {`
`139`	`139`	`"osDiskImage": {`
`140`	`140`	`"source": {`
`141`		`- "id": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",`
	`141`	`+ "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]",`
`142`	`142`	`"uri": "[parameters('vhdBlobURL')]"`
`143`	`143`	`}`
`144`	`144`	`}`