-
Notifications
You must be signed in to change notification settings - Fork 266
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into support-data-protection-for-blob-csi-driver
- Loading branch information
Showing
29 changed files
with
567 additions
and
219 deletions.
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
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,43 @@ | ||
| { | ||
| "kubernetesConfigurations": { | ||
| "kube-apiserver": { | ||
| "image": "{CUSTOM_KUBE_APISERVER_IMAGE}", | ||
| "config": { | ||
| "--kubelet-timeout": "10s", | ||
| "--log-flush-frequency": "10s", | ||
| "--profiling": "false", | ||
| "--v": "5" | ||
| } | ||
| }, | ||
| "kube-controller-manager": { | ||
| "image": "{CUSTOM_KCM_IMAGE}", | ||
| "config": { | ||
| "--pod-eviction-timeout": "4m", | ||
| "--profiling": "true" | ||
| } | ||
| }, | ||
| "kube-proxy": { | ||
| "image": "{CUSTOM_KUBE_PROXY_IMAGE}", | ||
| "config": { | ||
| "--config-sync-period": "10m", | ||
| "--conntrack-tcp-timeout-established": "12h", | ||
| "--v": "3" | ||
| } | ||
| }, | ||
| "kube-scheduler": { | ||
| "image": "{CUSTOM_KUBE_SCHEDULER_IMAGE}", | ||
| "config": { | ||
| "--http2-max-streams-per-connection": "200", | ||
| "--profiling": "false" | ||
| } | ||
| }, | ||
| "kubelet": { | ||
| "config": { | ||
| "--runtime-request-timeout": "3m", | ||
| "--streaming-connection-idle-timeout": "5h", | ||
| "--v": "3" | ||
| }, | ||
| "downloadURL": "{CUSTOM_KUBELET_URL}" | ||
| } | ||
| } | ||
| } |
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
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,28 @@ | ||
| { | ||
| "id": "{AKS_CLUSTER_ID}", | ||
| "name": "{CLUSTER_NAME}", | ||
| "location": "{AZURE_LOCATION}", | ||
| "type": "Microsoft.ContainerService/ManagedClusters", | ||
| "properties": { | ||
| "kubernetesVersion": "{KUBERNETES_VERSION}", | ||
| "dnsPrefix": "aks", | ||
| "agentPoolProfiles": [ | ||
| { | ||
| "name": "agentpool1", | ||
| "count": 2, | ||
| "mode": "System", | ||
| "vmSize": "Standard_DS2_v2", | ||
| "osType": "Linux", | ||
| "availabilityProfile": "VirtualMachineScaleSets", | ||
| "enableAutoScaling": true, | ||
| "maxCount": 1000, | ||
| "minCount": 1 | ||
| } | ||
| ], | ||
| "servicePrincipalProfile": { | ||
| "clientId": "{AZURE_CLIENT_ID}", | ||
| "secret": "{AZURE_CLIENT_SECRET}" | ||
| }, | ||
| "encodedCustomConfiguration": "{CUSTOM_CONFIG}" | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
kubetest2-aks/cluster-templates/customconfiguration-cas.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,14 @@ | ||
| { | ||
| "kubernetesConfigurations": { | ||
| "cluster-autoscaler": { | ||
| "image": "{CUSTOM_CAS_IMAGE}", | ||
| "config": { | ||
| "--skip-nodes-with-system-pods": "false", | ||
| "--scale-down-delay-after-add": "1m", | ||
| "--scale-down-unneeded-time": "1m", | ||
| "--scale-down-unready-time": "2m", | ||
| "--v": "4" | ||
| } | ||
| } | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.