Skip to content

Commit

Permalink
Users/lsnoddy/remove preview feature (#822)
Browse files Browse the repository at this point in the history 
* Update to new child-resource structure progress

* Progress check-in

* Added managed cluster name parameter

* Updated readme

* Updated readme file

* Updated readme

* Push updated Readme file(s)

* Updated readme

* Added test param file

* Updated subscriptionId

* Added test param file

* Removed subscription id

* Modified test variables

* Modified test variables

* Test dependency values

* Updated parameters

* Removed local files used for testing

* Updated readme

* Updated readme

* Revert "Push updated Readme file(s)"

This reverts commit a24964d.

* Updated readme

* Updated both readme files and agentPool paramter name consistency

* Push updated Readme file(s)

* Updated Api to API to appease linter

* Revert "Push updated Readme file(s)"

This reverts commit 39ae6ce.

* Reverted inadvertent readme change

* Updated agentPool param description

* Push updated Readme file(s)

* Revert "Push updated Readme file(s)"

This reverts commit c0bd1e1.

* Nodepools one word per linter error

* Push updated Readme file(s)

* Updated agentPool parameter name

* Updated agentPools parameter name

* Revert "Push updated Readme file(s)"

This reverts commit c3eb913.

* Push updated Readme file(s)

* Added parameters for all agentPool properties

* Updated name parameter

* Added required systemAssignedIdentity param for testing

* Added type parameter

* Updated containerLogMaxFiles

* Updated containerLogMaxFiles

* Updated cpuManagerPolicy param

* Updated image high and image low threshold params

* Updated topologyManagerPolicy param

* Updated transparentHugePageDefrag and transparentHugePageEnabled

* Updated osType parameter

* Updated proximityPlacementGroupID

* Updated proximityPlacementGroupId

* proximityPlacementGroupId test

* Updated parameter default values

* Updated nodePublicIpPrefixId param

* Updated nodePublicIpPrefixId

* Updated string values with null when empty

* Ucommented proximiytPlacementGroupId

* Added default vm size

* Change maxPods default to 10

* Changed maxPods default

* Param default mgmt

* Update osDiskType default

* Set osSKU default

* Updated parameters

* Updated sourceResourceId parameter default

* Updated sourceResourceId

* Updated creationData variable

* Comment out creationData - test

* Updated gpuInstanceProfile

* Updated gpu instance profile

* Updated osDiskType

* Updated sourceResourceId

* Updated sourceResourceId

* Updated conatinerLog params

* Updated containerLogMaxFiles

* Updated swapFileSize param

* swap file size update

* Updated swapFileSize

* Updated netCoreSomaxconn

* Updated netcoreSomaxconn param

* Updated netCoreNetdevMaxBacklog param

* Updated netCoreRmemDefault param

* Updated netCoreOptmemMax

* Updated netCoreWmemDefault param

* Updated netCoreWmemMax

* Update netCoreWmemMax param

* Updated netCoreOptmemMax param

* Updated netIpv4TcpMaxSynBacklog param

* Updated netIpv4TcpMaxTwBuckets param

* Update  netIpv4TcpFinTimeout param

* Update etIpv4TcpKeepaliveTime param

* Updated netIpv4TcpKeepaliveProbes

* Updated netIpv4TcpkeepaliveIntvl param

* Updated netIpv4NeighDefaultGcThresholds params

* Updated netIpv4NeighDefaultGcThresh2

* Updated Sysctl settings

* Removed unneccessary properties object

* Registry name test

* Updated readme files

* Updated parameter files for new agentpool format

* Updated readme files

* Update platform dependencies

* Updates

* Updated readme

* Updated readme

* Updated readme

* Revert "Update platform dependencies"

This reverts commit 55df214.

* Update

* Update

* Restore file

* Restore file

* Test restore

* Test revert

* Restore file

* Updated

* Removed agentPool example

* Removed extra spaces and changed comparison to not equal

* Removed agen pool example

* Push updated Readme file(s)

* Restored file

* Added missing network firewall policies link

* Revert "Push updated Readme file(s)"

This reverts commit c636da2.

* Moved managedCluster reference down to agent pool resource section

* Push updated Readme file(s)

* Revert "Push updated Readme file(s)"

This reverts commit c0aecda.

* Push updated Readme file(s)

* Revert "Push updated Readme file(s)"

This reverts commit 86d2ba8.

* Update arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep

Co-authored-by: Alexander Sehr <[email protected]>

* Update arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep

Co-authored-by: Alexander Sehr <[email protected]>

* Update arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep

Co-authored-by: Alexander Sehr <[email protected]>

* Update arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep

Co-authored-by: Alexander Sehr <[email protected]>

* Removed code associated with CustomNodeConfigPreview

Co-authored-by: CARMLPipelinePrincipal <[email protected]>
Co-authored-by: Alexander Sehr <[email protected]>
  • Loading branch information
@lsnoddy @AlexanderSehr
3 people authored Dec 20, 2021
1 parent 7400292 commit 67e13f2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 374 deletions.
287 changes: 0 additions & 287 deletions arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,242 +62,9 @@ param enableUltraSSD bool = false
])
param gpuInstanceProfile string = ''

@description('Optional. Allowed list of unsafe sysctls or unsafe sysctl patterns (ending in *).')
@allowed([
'kernel.shm*'
'kernel.msg*'
'kernel.sem*'
'fs.mqueue.*'
'net.*'
])
param allowedUnsafeSysctls array = [
'kernel.shm*'
'kernel.msg*'
'kernel.sem*'
'fs.mqueue.*'
'net.*'
]

@description('Optional. The maximum number of container log files that can be present for a container. The number must be >= 2.')
@minValue(2)
param containerLogMaxFiles int = 5

@description('Optional. The maximum size (e.g. 10 MB) of container log file before it is rotated.')
param containerLogMaxSizeMB int = 10

@description('Optional. Enable/Disable CPU CFS quota enforcement for containers that specify CPU limits.')
@allowed([
true
false
])
param cpuCfsQuota bool = true

@description('Optional. Sets CPU CFS quota period value. Valid values are a sequence of decimal numbers with an optional fraction and a unit suffix. For example: "300ms", "2h45m". Supported units are "ns", "us", "ms", "s", "m", and "h" .')
param cpuCfsQuotaPeriod string = '100ms'

@description('Optional. The static policy allows containers in Guaranteed pods with integer CPU requests access to exclusive CPUs on the node. See Kubernetes CPU management policies for more info (https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#cpu-management-policies)')
@allowed([
'none'
'static'
])
param cpuManagerPolicy string = 'none'

@description('Optional. If set to true it will make the Kubelet fail to start if swap is enabled on the node.')
@allowed([
true
false
])
param failSwapOn bool = false

@description('Optional. The percent of disk usage after which image garbage collection is always run. Minimum disk usage that will trigger garbage collection. To disable image garbage collection, set to 100.')
@minValue(0)
@maxValue(100)
param imageGcHighThreshold int = 85

@description('Optional. The percent of disk usage before which image garbage collection is never run. Minimum disk usage that can trigger garbage collection.')
@minValue(0)
@maxValue(100)
param imageGcLowThreshold int = 80

@description('Optional. The maximum number of processes per pod.')
@minValue(-1)
param podMaxPids int = -1

@description('Optional. Optimize NUMA node alignment. For more information see Kubernetes Topology Manager (https://kubernetes.io/docs/tasks/administer-cluster/topology-manager)')
@allowed([
'none'
'best-effort'
'restricted'
'single-numa-node'
])
param topologyManagerPolicy string = 'none'

@description('Optional. Determines the placement of emptyDir volumes, container runtime data root, and Kubelet ephemeral storage.')
param kubeletDiskType string = ''

@description('Optional. The size in MB of a swap file that will be created on each node.')
@minValue(1)
@maxValue(2147483647)
param swapFileSizeMB int = 1500

@description('Optional. Sysctl setting fs.aio-max-nr.')
@minValue(65536)
@maxValue(6553500)
param fsAioMaxNr int = 65536

@description('Optional. Sysctl setting fs.file-max.')
@minValue(8192)
@maxValue(12000500)
param fsFileMax int = 8192

@description('Optional. Sysctl setting fs.inotify.max_user_watches.')
@minValue(781250)
@maxValue(2097152)
param fsInotifyMaxUserWatches int = 781250

@description('Optional. Sysctl setting fs.nr_open.')
@minValue(8192)
@maxValue(20000500)
param fsNrOpen int = 8192

@description('Optional. Sysctl setting kernel.threads-max.')
@minValue(20)
@maxValue(513785)
param kernelThreadsMax int = 20

@description('Optional. Sysctl setting net.core.netdev_max_backlog.')
@minValue(1000)
@maxValue(3240000)
param netCoreNetdevMaxBacklog int = 1000

@description('Optional. Sysctl setting net.core.optmem_max.')
@minValue(20480)
@maxValue(4194304)
param netCoreOptmemMax int = 20480

@description('Optional. Sysctl setting net.core.rmem_default.')
@minValue(212992)
@maxValue(134217728)
param netCoreRmemDefault int = 212992

@description('Optional. Sysctl setting net.core.rmem_max.')
@minValue(212992)
@maxValue(134217728)
param netCoreRmemMax int = 212992

@description('Optional. Sysctl setting net.core.somaxconn.')
@minValue(4096)
@maxValue(3240000)
param netCoreSomaxconn int = 4096

@description('Optional. Sysctl setting net.core.wmem_default.')
@minValue(212992)
@maxValue(134217728)
param netCoreWmemDefault int = 212992

@description('Optional. Sysctl setting net.core.wmem_max.')
@minValue(212992)
@maxValue(134217728)
param netCoreWmemMax int = 212992

@description('Optional. Sysctl setting net.ipv4.ip_local_port_range.')
param netIpv4IpLocalPortRange string = ''

@description('Optional. Sysctl setting net.ipv4.neigh.default.gc_thresh1.')
@minValue(128)
@maxValue(80000)
param netIpv4NeighDefaultGcThresh1 int = 128

@description('Optional. Sysctl setting net.ipv4.neigh.default.gc_thresh2.')
@minValue(512)
@maxValue(90000)
param netIpv4NeighDefaultGcThresh2 int = 512

@description('Optional. Sysctl setting net.ipv4.neigh.default.gc_thresh3.')
@minValue(1024)
@maxValue(100000)
param netIpv4NeighDefaultGcThresh3 int = 1024

@description('Optional. Sysctl setting net.ipv4.tcp_fin_timeout.')
@minValue(5)
@maxValue(120)
param netIpv4TcpFinTimeout int = 5

@description('Optional. Sysctl setting net.ipv4.tcp_keepalive_intvl.')
@minValue(10)
@maxValue(75)
param netIpv4TcpkeepaliveIntvl int = 10

@description('Optional. Sysctl setting net.ipv4.tcp_keepalive_probes.')
@minValue(1)
@maxValue(15)
param netIpv4TcpKeepaliveProbes int = 1

@description('Optional. Sysctl setting net.ipv4.tcp_keepalive_time.')
@minValue(30)
@maxValue(432000)
param netIpv4TcpKeepaliveTime int = 30

@description('Optional. Sysctl setting net.ipv4.tcp_max_syn_backlog')
@minValue(128)
@maxValue(3240000)
param netIpv4TcpMaxSynBacklog int = 128

@description('Optional. Sysctl setting net.ipv4.tcp_max_tw_buckets.')
@minValue(8000)
@maxValue(1440000)
param netIpv4TcpMaxTwBuckets int = 8000

@description('Optional. Sysctl setting net.ipv4.tcp_tw_reuse.')
@allowed([
true
false
])
param netIpv4TcpTwReuse bool = false

@description('Optional. Sysctl setting net.netfilter.nf_conntrack_buckets.')
@minValue(65536)
@maxValue(147456)
param netNetfilterNfConntrackBuckets int = 65536

@description('Optional. Sysctl setting net.netfilter.nf_conntrack_max.')
@minValue(131072)
@maxValue(589824)
param netNetfilterNfConntrackMax int = 131072

@description('Optional. Sysctl setting vm.max_map_count.')
@minValue(65530)
@maxValue(262144)
param vmMaxMapCount int = 65530

@description('Optional. Sysctl setting vm.swappiness.')
@minValue(0)
@maxValue(100)
param vmSwappiness int = 0

@description('Optional. Sysctl setting vm.vfs_cache_pressure.')
@minValue(0)
@maxValue(100)
param vmVfsCachePressure int = 0

@description('Optional. See Transparent Hugepages (https://www.kernel.org/doc/html/latest/admin-guide/mm/transhuge.html#admin-guide-transhuge)')
@allowed([
'always'
'defer'
'defer+madvise'
'madvise'
'never'
])
param transparentHugePageDefrag string = 'madvise'

@description('Optional. See Transparent Hugepages (https://www.kernel.org/doc/html/latest/admin-guide/mm/transhuge.html#admin-guide-transhuge)')
@allowed([
'always'
'madvise'
'never'
])
param transparentHugePageEnabled string = 'always'

@description('Optional. The maximum number of nodes for auto-scaling')
param maxCount int = -1

Expand Down Expand Up @@ -401,58 +168,6 @@ var creationData = {
sourceResourceId: !empty(sourceResourceId) ? sourceResourceId : null
}

var kubeletConfig = {
allowedUnsafeSysctls: allowedUnsafeSysctls
containerLogMaxFiles: containerLogMaxFiles
containerLogMaxSizeMB: !(containerLogMaxSizeMB == -1) ? containerLogMaxSizeMB : null
cpuCfsQuota: cpuCfsQuota
cpuCfsQuotaPeriod: cpuCfsQuotaPeriod
cpuManagerPolicy: cpuManagerPolicy
failSwapOn: failSwapOn
imageGcHighThreshold: imageGcHighThreshold
imageGcLowThreshold: imageGcLowThreshold
podMaxPids: podMaxPids
topologyManagerPolicy: topologyManagerPolicy
}

var sysctls = {
fsAioMaxNr: fsAioMaxNr
fsFileMax: fsFileMax
fsInotifyMaxUserWatches: fsInotifyMaxUserWatches
fsNrOpen: fsNrOpen
kernelThreadsMax: kernelThreadsMax
netCoreNetdevMaxBacklog: netCoreNetdevMaxBacklog
netCoreOptmemMax: netCoreOptmemMax
netCoreRmemDefault: netCoreRmemDefault
netCoreRmemMax: netCoreRmemMax
netCoreSomaxconn: netCoreSomaxconn
netCoreWmemDefault: netCoreWmemDefault
netCoreWmemMax: netCoreWmemMax
netIpv4IpLocalPortRange: netIpv4IpLocalPortRange
netIpv4NeighDefaultGcThresh1: netIpv4NeighDefaultGcThresh1
netIpv4NeighDefaultGcThresh2: netIpv4NeighDefaultGcThresh2
netIpv4NeighDefaultGcThresh3: netIpv4NeighDefaultGcThresh3
netIpv4TcpFinTimeout: netIpv4TcpFinTimeout
netIpv4TcpkeepaliveIntvl: netIpv4TcpkeepaliveIntvl
netIpv4TcpKeepaliveProbes: netIpv4TcpKeepaliveProbes
netIpv4TcpKeepaliveTime: netIpv4TcpKeepaliveTime
netIpv4TcpMaxSynBacklog: netIpv4TcpMaxSynBacklog
netIpv4TcpMaxTwBuckets: netIpv4TcpMaxTwBuckets
netIpv4TcpTwReuse: netIpv4TcpTwReuse
netNetfilterNfConntrackBuckets: netNetfilterNfConntrackBuckets
netNetfilterNfConntrackMax: netNetfilterNfConntrackMax
vmMaxMapCount: vmMaxMapCount
vmSwappiness: vmSwappiness
vmVfsCachePressure: vmVfsCachePressure
}

var linuxOSConfig = {
swapFileSizeMB: swapFileSizeMB
sysctls: sysctls
transparentHugePageDefrag: transparentHugePageDefrag
transparentHugePageEnabled: transparentHugePageEnabled
}

var upgradeSettings = {
maxSurge: maxSurge
}
Expand Down Expand Up @@ -482,9 +197,7 @@ resource agentPool 'Microsoft.ContainerService/managedClusters/agentPools@2021-0
enableNodePublicIP: enableNodePublicIP
enableUltraSSD: enableUltraSSD
gpuInstanceProfile: !empty(gpuInstanceProfile) ? gpuInstanceProfile : null
kubeletConfig: kubeletConfig
kubeletDiskType: kubeletDiskType
linuxOSConfig: linuxOSConfig
maxCount: maxCount != -1 ? maxCount : null
maxPods: maxPods != -1 ? maxPods : null
minCount: minCount != -1 ? minCount : null
Expand Down
Loading

0 comments on commit 67e13f2

Please sign in to comment.