kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16253 from argusua/fix-max-pods-when-cilium-ipam-eni-used 

aws: fix maxPods when cilium ipam=eni is used
This commit is contained in:
Kubernetes Prow Robot 2024-01-17 16:15:38 +01:00 committed by GitHub
parent 63e5d6ce73 d9075f1d18
commit 82f4082e8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/kubelet.go
View File

@ -634,7 +634,7 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro
c.ClientCAFile = filepath.Join(b.PathSrvKubernetes(), "ca.crt") c.ClientCAFile = filepath.Join(b.PathSrvKubernetes(), "ca.crt")
// Respect any MaxPods value the user sets explicitly. // Respect any MaxPods value the user sets explicitly.
if b.NodeupConfig.Networking.AmazonVPC != nil && c.MaxPods == nil { if (b.NodeupConfig.Networking.AmazonVPC != nil || (b.NodeupConfig.Networking.Cilium != nil && b.NodeupConfig.Networking.Cilium.IPAM == kops.CiliumIpamEni)) && c.MaxPods == nil {
sess := session.Must(session.NewSession()) sess := session.Must(session.NewSession())
metadata := ec2metadata.New(sess) metadata := ec2metadata.New(sess)