Skip to content

Revert "Add controlPlaneSubnetId for AKS API server injection (#21718)" #22149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leniatgh merged 1 commit into from
Jan 12, 2023
Merged

Revert "Add controlPlaneSubnetId for AKS API server injection (#21718)" #22149

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...on/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ManagedEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,17 +1114,9 @@
"read"
]
},
"controlPlaneSubnetId": {
"type": "string",
"description": "Resource ID of a subnet for control plane components. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges.",
"x-ms-mutability": [
"create",
"read"
]
},
"infrastructureSubnetId": {
"type": "string",
"description": "Resource ID of a subnet for infrastructure components. This subnet must be in the same VNET as the subnet defined in controlPlaneSubnetId if provided. Must not overlap with any other provided IP ranges.",
"description": "Resource ID of a subnet for infrastructure components. This subnet must be in the same VNET as the subnet defined in runtimeSubnetId. Must not overlap with any other provided IP ranges.",
"x-ms-mutability": [
"create",
"read"
Expand Down
15 changes: 6 additions & 9 deletions ...Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
},
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down Expand Up @@ -72,10 +71,9 @@
},
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down Expand Up @@ -127,10 +125,9 @@
},
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down
5 changes: 2 additions & 3 deletions ...ce-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
"staticIp": "20.42.33.145",
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down
10 changes: 4 additions & 6 deletions ...soft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@
"appLogsConfiguration": null,
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down Expand Up @@ -83,10 +82,9 @@
},
"eventStreamEndpoint": "testEndpoint",
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
}
}
Expand Down
10 changes: 4 additions & 6 deletions ...osoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
"appLogsConfiguration": null,
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down Expand Up @@ -74,10 +73,9 @@
"appLogsConfiguration": null,
"zoneRedundant": true,
"vnetConfiguration": {
"infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1",
"controlPlaneSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName2",
"outboundSettings": {
"outBoundType": "UserDefinedRouting"
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
Expand Down