-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
aks: add enableCustomCATrust in v20220402-preview api-version #18830
Merged
tyler-lloyd
merged 3 commits into
Azure:dev-containerservice-Microsoft.ContainerService-2022-04-02-preview
from
UtheMan:mikolaj/add-custom-ca-trust
May 3, 2022
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -484,6 +484,7 @@ CVEs | |
| CVSS | ||
| Cyrl | ||
| dacl | ||
| DaemonSet | ||
| dailyforecast | ||
| dailyhistorical | ||
| dapr | ||
|
|
||
54 changes: 54 additions & 0 deletions
54
...inerService/preview/2022-04-02-preview/examples/AgentPoolsCreate_EnableCustomCATrust.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2022-04-02-preview", | ||
| "subscriptionId": "subid1", | ||
| "resourceGroupName": "rg1", | ||
| "resourceName": "clustername1", | ||
| "agentPoolName": "agentpool1", | ||
| "parameters": { | ||
| "properties": { | ||
| "orchestratorVersion": "", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "osType": "Linux", | ||
| "enableCustomCATrust": true | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", | ||
| "type": "Microsoft.ContainerService/managedClusters/agentPools", | ||
| "name": "agentpool1", | ||
| "properties": { | ||
| "provisioningState": "Succeeded", | ||
| "orchestratorVersion": "1.19.6", | ||
| "currentOrchestratorVersion": "1.19.6", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "maxPods": 110, | ||
| "osType": "Linux", | ||
| "enableCustomCATrust": true | ||
| } | ||
| } | ||
| }, | ||
| "201": { | ||
| "body": { | ||
| "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", | ||
| "type": "Microsoft.ContainerService/managedClusters/agentPools", | ||
| "name": "agentpool1", | ||
| "properties": { | ||
| "provisioningState": "Creating", | ||
| "orchestratorVersion": "1.19.6", | ||
| "currentOrchestratorVersion": "1.19.6", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "maxPods": 110, | ||
| "osType": "Linux", | ||
| "enableCustomCATrust": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
256 changes: 256 additions & 0 deletions
256
...ervice/preview/2022-04-02-preview/examples/ManagedClustersCreate_EnableCustomCATrust.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,256 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2022-04-02-preview", | ||
| "subscriptionId": "subid1", | ||
| "resourceGroupName": "rg1", | ||
| "resourceName": "clustername1", | ||
| "parameters": { | ||
| "location": "location1", | ||
| "tags": { | ||
| "tier": "production", | ||
| "archv2": "" | ||
| }, | ||
| "sku": { | ||
| "name": "Basic", | ||
| "tier": "Free" | ||
| }, | ||
| "properties": { | ||
| "kubernetesVersion": "", | ||
| "dnsPrefix": "dnsprefix1", | ||
| "agentPoolProfiles": [ | ||
| { | ||
| "name": "nodepool1", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "osType": "Linux", | ||
| "type": "VirtualMachineScaleSets", | ||
| "enableNodePublicIP": true, | ||
| "mode": "System", | ||
| "enableCustomCATrust": true | ||
| } | ||
| ], | ||
| "linuxProfile": { | ||
| "adminUsername": "azureuser", | ||
| "ssh": { | ||
| "publicKeys": [ | ||
| { | ||
| "keyData": "keydata" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "networkProfile": { | ||
| "loadBalancerSku": "standard", | ||
| "outboundType": "loadBalancer", | ||
| "loadBalancerProfile": { | ||
| "managedOutboundIPs": { | ||
| "count": 2 | ||
| } | ||
| } | ||
| }, | ||
| "autoScalerProfile": { | ||
| "scan-interval": "20s", | ||
| "scale-down-delay-after-add": "15m" | ||
| }, | ||
| "windowsProfile": { | ||
| "adminUsername": "azureuser", | ||
| "adminPassword": "replacePassword1234$" | ||
| }, | ||
| "servicePrincipalProfile": { | ||
| "clientId": "clientid", | ||
| "secret": "secret" | ||
| }, | ||
| "addonProfiles": {}, | ||
| "enableRBAC": true, | ||
| "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", | ||
| "enablePodSecurityPolicy": true | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", | ||
| "location": "location1", | ||
| "name": "clustername1", | ||
| "tags": { | ||
| "archv2": "", | ||
| "tier": "production" | ||
| }, | ||
| "type": "Microsoft.ContainerService/ManagedClusters", | ||
| "properties": { | ||
| "provisioningState": "Succeeded", | ||
| "maxAgentPools": 1, | ||
| "kubernetesVersion": "1.9.6", | ||
| "dnsPrefix": "dnsprefix1", | ||
| "agentPoolProfiles": [ | ||
| { | ||
| "name": "nodepool1", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "maxPods": 110, | ||
| "osType": "Linux", | ||
| "provisioningState": "Succeeded", | ||
| "orchestratorVersion": "1.9.6", | ||
| "currentOrchestratorVersion": "1.9.6", | ||
| "type": "VirtualMachineScaleSets", | ||
| "enableNodePublicIP": true, | ||
| "mode": "System", | ||
| "nodeImageVersion": "AKSUbuntu:1604:2020.03.11", | ||
| "enableCustomCATrust": true | ||
| } | ||
| ], | ||
| "linuxProfile": { | ||
| "adminUsername": "azureuser", | ||
| "ssh": { | ||
| "publicKeys": [ | ||
| { | ||
| "keyData": "keydata" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "windowsProfile": { | ||
| "adminUsername": "azureuser" | ||
| }, | ||
| "servicePrincipalProfile": { | ||
| "clientId": "clientid" | ||
| }, | ||
| "nodeResourceGroup": "MC_rg1_clustername1_location1", | ||
| "enableRBAC": true, | ||
| "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", | ||
| "enablePodSecurityPolicy": true, | ||
| "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", | ||
| "networkProfile": { | ||
| "loadBalancerSku": "basic", | ||
| "networkPlugin": "kubenet", | ||
| "podCidr": "10.244.0.0/16", | ||
| "serviceCidr": "10.0.0.0/16", | ||
| "dnsServiceIP": "10.0.0.10", | ||
| "dockerBridgeCidr": "172.17.0.1/16", | ||
| "outboundType": "loadBalancer", | ||
| "podCidrs": [ | ||
| "10.244.0.0/16" | ||
| ], | ||
| "serviceCidrs": [ | ||
| "10.0.0.0/16" | ||
| ], | ||
| "ipFamilies": [ | ||
| "IPv4" | ||
| ], | ||
| "loadBalancerProfile": { | ||
| "allocatedOutboundPorts": 2000, | ||
| "idleTimeoutInMinutes": 10, | ||
| "managedOutboundIPs": { | ||
| "count": 2 | ||
| }, | ||
| "effectiveOutboundIPs": [ | ||
| { | ||
| "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" | ||
| }, | ||
| { | ||
| "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "autoScalerProfile": { | ||
| "scan-interval": "20s", | ||
| "scale-down-delay-after-add": "15m" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "201": { | ||
| "body": { | ||
| "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", | ||
| "location": "location1", | ||
| "name": "clustername1", | ||
| "tags": { | ||
| "archv2": "", | ||
| "tier": "production" | ||
| }, | ||
| "type": "Microsoft.ContainerService/ManagedClusters", | ||
| "properties": { | ||
| "provisioningState": "Creating", | ||
| "maxAgentPools": 1, | ||
| "kubernetesVersion": "1.9.6", | ||
| "dnsPrefix": "dnsprefix1", | ||
| "agentPoolProfiles": [ | ||
| { | ||
| "name": "nodepool1", | ||
| "count": 3, | ||
| "vmSize": "Standard_DS2_v2", | ||
| "maxPods": 110, | ||
| "osType": "Linux", | ||
| "provisioningState": "Creating", | ||
| "orchestratorVersion": "1.9.6", | ||
| "currentOrchestratorVersion": "1.9.6", | ||
| "type": "VirtualMachineScaleSets", | ||
| "enableNodePublicIP": true, | ||
| "mode": "System", | ||
| "enableCustomCATrust": true | ||
| } | ||
| ], | ||
| "linuxProfile": { | ||
| "adminUsername": "azureuser", | ||
| "ssh": { | ||
| "publicKeys": [ | ||
| { | ||
| "keyData": "keydata" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "windowsProfile": { | ||
| "adminUsername": "azureuser" | ||
| }, | ||
| "servicePrincipalProfile": { | ||
| "clientId": "clientid" | ||
| }, | ||
| "nodeResourceGroup": "MC_rg1_clustername1_location1", | ||
| "enableRBAC": true, | ||
| "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", | ||
| "enablePodSecurityPolicy": true, | ||
| "networkProfile": { | ||
| "networkPlugin": "kubenet", | ||
| "podCidr": "10.244.0.0/16", | ||
| "serviceCidr": "10.0.0.0/16", | ||
| "dnsServiceIP": "10.0.0.10", | ||
| "dockerBridgeCidr": "172.17.0.1/16", | ||
| "loadBalancerSku": "standard", | ||
| "outboundType": "loadBalancer", | ||
| "podCidrs": [ | ||
| "10.244.0.0/16" | ||
| ], | ||
| "serviceCidrs": [ | ||
| "10.0.0.0/16" | ||
| ], | ||
| "ipFamilies": [ | ||
| "IPv4" | ||
| ], | ||
| "loadBalancerProfile": { | ||
| "allocatedOutboundPorts": 2000, | ||
| "idleTimeoutInMinutes": 10, | ||
| "managedOutboundIPs": { | ||
| "count": 2 | ||
| }, | ||
| "effectiveOutboundIPs": [ | ||
| { | ||
| "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" | ||
| }, | ||
| { | ||
| "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "autoScalerProfile": { | ||
| "scan-interval": "20s", | ||
| "scale-down-delay-after-add": "15m" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this reviewed in an API review meeting? I have some questions like:
Profile? ASecurityProfileor somesuch on AP, rather than just just jamming everything into the top level?These sorts of things would hopefully have been covered in an official API review internally but I'm not sure we had one where this was explicitly discussed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(from offline discussion)
the bool would be enabled/disabled, so bool should be fine.
as far as profiles -- maybe something for future discussion? we didn't see a reason to break with the pattern, e.g. this isn't related to some set of features, but I don't love that we perpetually add One More Knob to AP either.