Limit maxpods calculation to only DS hostnetwork (#534)

Co-authored-by: Christian Bianchi <[email protected]>
giantswarm · Dec 15, 2021 · 9048302 · 9048302
1 parent 9d84cd1
commit 9048302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Limited hostnetwork pods to the daemonsets only when calculating max pods
+
 ## [5.6.0] - 2021-12-15
 
 ### Changed

diff --git a/templates/files/conf/setup-kubelet-environment b/templates/files/conf/setup-kubelet-environment
@@ -18,7 +18,11 @@ instance_type="$(curl http://169.254.169.254/latest/meta-data/instance-type 2>/d
 # 1 ENI for the node, 1 for ETCD
 reserved_eni=2
 # Only counting daemonsets, as they are mandatory in all nodes
-hostnetwork_pods=9
+# Note: we don't include deployments that use host network unless
+# they're set to run on all master nodes. The reason for this is
+# on nodes where that deployment isn't running the scheduler will
+# think another pod is able to be scheduled where it's not.
+hostnetwork_pods=4
 {{ else }}
 # 1 ENI for the node
 reserved_eni=1