Merge pull request #994 from etungsten/maxpods-not-maxpods

kubelet config: `maxPods`, not `MaxPods`, update `eni-max-pods` file with new instance types
bottlerocket-os · Jul 17, 2020 · 1ecb62d · 1ecb62d
2 parents 55aee0a + 97b1cf8
commit 1ecb62d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/packages/kubernetes-1.15/kubelet-config b/packages/kubernetes-1.15/kubelet-config
@@ -30,4 +30,4 @@ serverTLSBootstrap: true
 configMapAndSecretChangeDetectionStrategy: Cache
 tlsCipherSuites:
 - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-MaxPods: {{default 110 settings.kubernetes.max-pods}}
+maxPods: {{default 110 settings.kubernetes.max-pods}}
diff --git a/packages/kubernetes-1.16/kubelet-config b/packages/kubernetes-1.16/kubelet-config
@@ -30,4 +30,4 @@ serverTLSBootstrap: true
 configMapAndSecretChangeDetectionStrategy: Cache
 tlsCipherSuites:
 - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-MaxPods: {{default 110 settings.kubernetes.max-pods}}
+maxPods: {{default 110 settings.kubernetes.max-pods}}
diff --git a/packages/kubernetes-1.17/kubelet-config b/packages/kubernetes-1.17/kubelet-config
@@ -31,4 +31,4 @@ serverTLSBootstrap: true
 configMapAndSecretChangeDetectionStrategy: Cache
 tlsCipherSuites:
 - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-MaxPods: {{default 110 settings.kubernetes.max-pods}}
+maxPods: {{default 110 settings.kubernetes.max-pods}}
diff --git a/packages/os/eni-max-pods b/packages/os/eni-max-pods
@@ -37,6 +37,24 @@ c5.12xlarge 234
 c5.18xlarge 737
 c5.24xlarge 737
 c5.metal 737
+c5a.large 29
+c5a.xlarge 58
+c5a.2xlarge 58
+c5a.4xlarge 234
+c5a.8xlarge 234
+c5a.12xlarge 234
+c5a.16xlarge 737
+c5a.24xlarge 737
+c5a.metal 737
+c5ad.large 29
+c5ad.xlarge 58
+c5ad.2xlarge 58
+c5ad.4xlarge 234
+c5ad.8xlarge 234
+c5ad.12xlarge 234
+c5ad.16xlarge 737
+c5ad.24xlarge 737
+c5ad.metal 737
 c5d.large 29
 c5d.xlarge 58
 c5d.2xlarge 58
@@ -97,6 +115,10 @@ i3en.3xlarge 58
 i3en.6xlarge 234
 i3en.12xlarge 234
 i3en.24xlarge 737
+inf1.xlarge 38
+inf1.2xlarge 38
+inf1.6xlarge 234
+inf1.24xlarge 437
 m1.small 8
 m1.medium 12
 m1.large 29