Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
30d0ec1
Update to new child-resource structure progress
lsnoddy Nov 16, 2021
7b8ea9f
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules int…
lsnoddy Nov 16, 2021
e725966
Progress check-in
lsnoddy Nov 16, 2021
0454fa2
Added managed cluster name parameter
lsnoddy Nov 17, 2021
aad50a9
Updated readme
lsnoddy Nov 17, 2021
8e3f37e
Merge branch 'Azure:main' into main
lsnoddy Nov 17, 2021
eb9ac8f
Updated readme file
lsnoddy Nov 18, 2021
4895bfd
Updated readme
lsnoddy Nov 18, 2021
a24964d
Push updated Readme file(s)
Nov 18, 2021
9da3646
Updated readme
lsnoddy Nov 18, 2021
3ccc8dd
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules
lsnoddy Nov 18, 2021
4210ecf
Added test param file
lsnoddy Nov 18, 2021
4ce1e3b
Updated subscriptionId
lsnoddy Nov 18, 2021
a9726f6
Added test param file
lsnoddy Nov 18, 2021
ed984d6
Removed subscription id
lsnoddy Nov 18, 2021
0380167
Modified test variables
lsnoddy Nov 18, 2021
ecf407a
Modified test variables
lsnoddy Nov 18, 2021
40ffa48
Test dependency values
lsnoddy Nov 18, 2021
f03ac3a
Updated parameters
lsnoddy Nov 18, 2021
d056b74
Removed local files used for testing
lsnoddy Nov 18, 2021
8f3447b
Merge branch 'Azure:main' into main
lsnoddy Nov 18, 2021
a792c19
Updated readme
lsnoddy Nov 18, 2021
d128feb
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules
lsnoddy Nov 18, 2021
cc8c087
Updated readme
lsnoddy Nov 18, 2021
30a00ca
Revert "Push updated Readme file(s)"
lsnoddy Nov 18, 2021
20a3955
Updated readme
lsnoddy Nov 18, 2021
5139c68
Updated both readme files and agentPool paramter name consistency
lsnoddy Nov 18, 2021
39ae6ce
Push updated Readme file(s)
Nov 18, 2021
20c6a88
Merge branch 'Azure:main' into main
lsnoddy Nov 18, 2021
5621dcb
Updated Api to API to appease linter
lsnoddy Nov 18, 2021
9b70753
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules
lsnoddy Nov 18, 2021
739eaaa
Revert "Push updated Readme file(s)"
lsnoddy Nov 18, 2021
2b7cb79
Reverted inadvertent readme change
lsnoddy Nov 18, 2021
49b9db4
Updated agentPool param description
lsnoddy Nov 18, 2021
c0bd1e1
Push updated Readme file(s)
Nov 18, 2021
a83d800
Revert "Push updated Readme file(s)"
lsnoddy Nov 18, 2021
0bb00a6
Nodepools one word per linter error
lsnoddy Nov 18, 2021
f091548
Merge branch 'Azure:main' into main
lsnoddy Nov 19, 2021
c3eb913
Push updated Readme file(s)
Nov 19, 2021
2f2ca3e
Updated agentPool parameter name
lsnoddy Nov 19, 2021
d8a05dd
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules
lsnoddy Nov 19, 2021
c124011
Updated agentPools parameter name
lsnoddy Nov 19, 2021
c16d00b
Revert "Push updated Readme file(s)"
lsnoddy Nov 19, 2021
c0dbb14
Merge branch 'Azure:main' into main
lsnoddy Nov 30, 2021
74848f7
Push updated Readme file(s)
Nov 30, 2021
0b4967c
Merge branch 'Azure:main' into main
lsnoddy Dec 7, 2021
7ddf8d8
Added parameters for all agentPool properties
lsnoddy Dec 7, 2021
9a08b67
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules int…
lsnoddy Dec 7, 2021
2c7a003
Updated name parameter
lsnoddy Dec 7, 2021
18e8d8f
Added required systemAssignedIdentity param for testing
lsnoddy Dec 7, 2021
7d4842b
Added type parameter
lsnoddy Dec 7, 2021
a3e16d2
Updated containerLogMaxFiles
lsnoddy Dec 7, 2021
fd4f994
Updated containerLogMaxFiles
lsnoddy Dec 7, 2021
1d4d23e
Updated cpuManagerPolicy param
lsnoddy Dec 7, 2021
deef818
Updated image high and image low threshold params
lsnoddy Dec 7, 2021
89a50bd
Updated topologyManagerPolicy param
lsnoddy Dec 7, 2021
663696d
Updated transparentHugePageDefrag and transparentHugePageEnabled
lsnoddy Dec 7, 2021
296902c
Updated osType parameter
lsnoddy Dec 7, 2021
b9ba9db
Updated proximityPlacementGroupID
lsnoddy Dec 7, 2021
e839e3b
Updated proximityPlacementGroupId
lsnoddy Dec 7, 2021
ddb628d
proximityPlacementGroupId test
lsnoddy Dec 7, 2021
7d59468
Updated parameter default values
lsnoddy Dec 7, 2021
a23bf71
Updated nodePublicIpPrefixId param
lsnoddy Dec 8, 2021
ccd9582
Updated nodePublicIpPrefixId
lsnoddy Dec 8, 2021
5fb7155
Updated string values with null when empty
lsnoddy Dec 8, 2021
e3f2611
Ucommented proximiytPlacementGroupId
lsnoddy Dec 8, 2021
ce56a72
Added default vm size
lsnoddy Dec 8, 2021
84ecd5f
Change maxPods default to 10
lsnoddy Dec 8, 2021
09bf068
Changed maxPods default
lsnoddy Dec 8, 2021
a859702
Param default mgmt
lsnoddy Dec 8, 2021
8b58c1c
Update osDiskType default
lsnoddy Dec 8, 2021
42de993
Set osSKU default
lsnoddy Dec 8, 2021
5125f28
Updated parameters
lsnoddy Dec 8, 2021
978782d
Updated sourceResourceId parameter default
lsnoddy Dec 8, 2021
3d1dd7a
Updated sourceResourceId
lsnoddy Dec 8, 2021
fa7045d
Updated creationData variable
lsnoddy Dec 8, 2021
3a9d6db
Comment out creationData - test
lsnoddy Dec 8, 2021
a0c81d9
Updated gpuInstanceProfile
lsnoddy Dec 8, 2021
bee9575
Updated gpu instance profile
lsnoddy Dec 8, 2021
4ae05f0
Updated osDiskType
lsnoddy Dec 8, 2021
98d034c
Updated sourceResourceId
lsnoddy Dec 8, 2021
0891302
Updated sourceResourceId
lsnoddy Dec 8, 2021
de7941c
Updated conatinerLog params
lsnoddy Dec 8, 2021
2f6f31e
Updated containerLogMaxFiles
lsnoddy Dec 8, 2021
603d5f2
Updated swapFileSize param
lsnoddy Dec 8, 2021
0579e73
swap file size update
lsnoddy Dec 8, 2021
9b01703
Updated swapFileSize
lsnoddy Dec 8, 2021
52d01aa
Updated netCoreSomaxconn
lsnoddy Dec 8, 2021
d7ef505
Updated netcoreSomaxconn param
lsnoddy Dec 8, 2021
6c04c8c
Updated netCoreNetdevMaxBacklog param
lsnoddy Dec 8, 2021
c1d836a
Updated netCoreRmemDefault param
lsnoddy Dec 8, 2021
9fef014
Updated netCoreOptmemMax
lsnoddy Dec 9, 2021
d89cb45
Updated netCoreWmemDefault param
lsnoddy Dec 9, 2021
b327cf9
Updated netCoreWmemMax
lsnoddy Dec 9, 2021
5129755
Update netCoreWmemMax param
lsnoddy Dec 9, 2021
5a0deda
Updated netCoreOptmemMax param
lsnoddy Dec 9, 2021
355c95f
Updated netIpv4TcpMaxSynBacklog param
lsnoddy Dec 9, 2021
a49a68e
Updated netIpv4TcpMaxTwBuckets param
lsnoddy Dec 9, 2021
6ad6932
Update netIpv4TcpFinTimeout param
lsnoddy Dec 9, 2021
3adbb7e
Update etIpv4TcpKeepaliveTime param
lsnoddy Dec 9, 2021
81c59d0
Updated netIpv4TcpKeepaliveProbes
lsnoddy Dec 9, 2021
7db9d72
Updated netIpv4TcpkeepaliveIntvl param
lsnoddy Dec 9, 2021
aa9f5b4
Updated netIpv4NeighDefaultGcThresholds params
lsnoddy Dec 9, 2021
c1453a7
Updated netIpv4NeighDefaultGcThresh2
lsnoddy Dec 9, 2021
94dc04d
Updated Sysctl settings
lsnoddy Dec 9, 2021
9bbc954
Removed unneccessary properties object
lsnoddy Dec 9, 2021
9422ef3
Registry name test
lsnoddy Dec 10, 2021
983e0fd
Updated readme files
lsnoddy Dec 12, 2021
f0413be
Updated parameter files for new agentpool format
lsnoddy Dec 13, 2021
b1d50c2
Updated readme files
lsnoddy Dec 13, 2021
25ad3d9
Merge branch 'Azure:main' into main
lsnoddy Dec 13, 2021
55df214
Update platform dependencies
lsnoddy Dec 13, 2021
4a6be5d
Merge branch 'main' of https://github.com/lsnoddy/ResourceModules
lsnoddy Dec 13, 2021
aad14b5
Updates
lsnoddy Dec 13, 2021
e9be3a1
Updated readme
lsnoddy Dec 13, 2021
a801e70
Updated readme
lsnoddy Dec 13, 2021
d73ce94
Updated readme
lsnoddy Dec 13, 2021
08c4fb8
Revert "Update platform dependencies"
lsnoddy Dec 13, 2021
d2b6584
Update
lsnoddy Dec 13, 2021
9ee57d7
Update
lsnoddy Dec 13, 2021
f698b13
Restore file
lsnoddy Dec 13, 2021
c36c67b
Restore file
lsnoddy Dec 13, 2021
73e0b0c
Test restore
lsnoddy Dec 13, 2021
0f5f1ad
Test revert
lsnoddy Dec 13, 2021
6c5005c
Restore file
lsnoddy Dec 13, 2021
40d4228
Updated
lsnoddy Dec 13, 2021
757c7b9
Removed agentPool example
lsnoddy Dec 13, 2021
eb4fefb
Removed extra spaces and changed comparison to not equal
lsnoddy Dec 13, 2021
970c912
Removed agen pool example
lsnoddy Dec 13, 2021
c636da2
Push updated Readme file(s)
Dec 13, 2021
1596243
Restored file
lsnoddy Dec 13, 2021
b7c8cc6
Added missing network firewall policies link
lsnoddy Dec 13, 2021
e6f9847
Revert "Push updated Readme file(s)"
lsnoddy Dec 13, 2021
0d32209
Moved managedCluster reference down to agent pool resource section
lsnoddy Dec 13, 2021
c0aecda
Push updated Readme file(s)
Dec 13, 2021
158971b
Revert "Push updated Readme file(s)"
lsnoddy Dec 13, 2021
cf73a0c
Merge branch 'main' into main
lsnoddy Dec 14, 2021
86d2ba8
Push updated Readme file(s)
Dec 14, 2021
39782ce
Revert "Push updated Readme file(s)"
lsnoddy Dec 15, 2021
f125926
Update arm/Microsoft.ContainerService/managedClusters/agentPools/depl…
lsnoddy Dec 15, 2021
1ba9267
Update arm/Microsoft.ContainerService/managedClusters/agentPools/depl…
lsnoddy Dec 15, 2021
0728bff
Update arm/Microsoft.ContainerService/managedClusters/agentPools/depl…
lsnoddy Dec 15, 2021
3bbb817
Update arm/Microsoft.ContainerService/managedClusters/agentPools/depl…
lsnoddy Dec 15, 2021
79c111f
Merge branch 'Azure:main' into main
lsnoddy Dec 15, 2021
4ac2937
Merge branch 'Azure:main' into main
lsnoddy Dec 16, 2021
fdadc90
Removed code associated with CustomNodeConfigPreview
lsnoddy Dec 17, 2021
b728fb0
Merge branch 'main' into users/lsnoddy/removePreviewFeature
AlexanderSehr Dec 20, 2021
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
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