Skip to content

Commit 6b0f97f

Browse files
Revert "Spec for ProtectedSettingsFromKeyVault and AllowExtensionOperations (#16590)" (#17121)
This reverts commit 220cfd0.
1 parent 5772d2d commit 6b0f97f

File tree

3 files changed

+1
-325
lines changed

3 files changed

+1
-325
lines changed

specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/compute.json

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,7 +1723,7 @@
17231723
"x-ms-long-running-operation": true,
17241724
"x-ms-examples": {
17251725
"Update VM extension.": {
1726-
"$ref": "./examples/compute/UpdateVMExtension.json"
1726+
"$ref": "./examples/compute/UpdateVMExtensionWithSuppressFailureEnabled.json"
17271727
}
17281728
}
17291729
},
@@ -5425,9 +5425,6 @@
54255425
},
54265426
"Create a scale set with spot restore policy": {
54275427
"$ref": "./examples/compute/CreateAScaleSetWithSpotRestorePolicy.json"
5428-
},
5429-
"Create a VMSS with an extension with protectedSettingsFromKeyVault": {
5430-
"$ref": "./examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json"
54315428
}
54325429
}
54335430
},
@@ -9533,10 +9530,6 @@
95339530
"suppressFailures": {
95349531
"type": "boolean",
95359532
"description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false."
9536-
},
9537-
"protectedSettingsFromKeyVault": {
9538-
"type": "object",
9539-
"description": "The extensions protected settings that are passed by reference, and consumed from key vault"
95409533
}
95419534
},
95429535
"description": "Describes the properties of a Virtual Machine Extension."
@@ -9578,10 +9571,6 @@
95789571
"suppressFailures": {
95799572
"type": "boolean",
95809573
"description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false."
9581-
},
9582-
"protectedSettingsFromKeyVault": {
9583-
"type": "object",
9584-
"description": "The extensions protected settings that are passed by reference, and consumed from key vault"
95859574
}
95869575
},
95879576
"description": "Describes the properties of a Virtual Machine Extension."
@@ -12597,10 +12586,6 @@
1259712586
"$ref": "#/definitions/VaultSecretGroup"
1259812587
},
1259912588
"description": "Specifies set of certificates that should be installed onto the virtual machines in the scale set. To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows)."
12600-
},
12601-
"allowExtensionOperations": {
12602-
"type": "boolean",
12603-
"description": "Specifies whether extension operations should be allowed on the virtual machine scale set. <br><br>This may only be set to False when no extensions are present on the virtual machine scale set."
1260412589
}
1260512590
},
1260612591
"description": "Describes a virtual machine scale set OS profile."
@@ -13371,10 +13356,6 @@
1337113356
"suppressFailures": {
1337213357
"type": "boolean",
1337313358
"description": "Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false."
13374-
},
13375-
"protectedSettingsFromKeyVault": {
13376-
"type": "object",
13377-
"description": "The extensions protected settings that are passed by reference, and consumed from key vault"
1337813359
}
1337913360
},
1338013361
"description": "Describes the properties of a Virtual Machine Scale Set Extension."

specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/compute/CreateAScaleSetWithProtectedSettingsFromKeyVault.json

Lines changed: 0 additions & 293 deletions
This file was deleted.
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
"suppressFailures": true,
1515
"settings": {
1616
"UserName": "[email protected]"
17-
},
18-
"protectedSettingsFromKeyVault": {
19-
"sourceVault": {
20-
"id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName"
21-
},
22-
"secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e"
2317
}
2418
}
2519
}
@@ -40,12 +34,6 @@
4034
"suppressFailures": true,
4135
"settings": {
4236
"UserName": "[email protected]"
43-
},
44-
"protectedSettingsFromKeyVault": {
45-
"sourceVault": {
46-
"id": "/subscriptions/a53f7094-a16c-47af-abe4-b05c05d0d79a/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/kvName"
47-
},
48-
"secretUrl": "https://kvName.vault.azure.net/secrets/secretName/79b88b3a6f5440ffb2e73e44a0db712e"
4937
}
5038
}
5139
}

0 commit comments

Comments
 (0)