diff --git a/pkg/cloudprovider/aws/amifamily/bootstrap/eksbootstrap.go b/pkg/cloudprovider/aws/amifamily/bootstrap/eksbootstrap.go index 91464d7098a5..4d64a410b7c5 100644 --- a/pkg/cloudprovider/aws/amifamily/bootstrap/eksbootstrap.go +++ b/pkg/cloudprovider/aws/amifamily/bootstrap/eksbootstrap.go @@ -31,24 +31,25 @@ type EKS struct { func (e EKS) Script() string { var caBundleArg string if e.CABundle != nil { - caBundleArg = fmt.Sprintf("--b64-cluster-ca='%s'", *e.CABundle) + caBundleArg = fmt.Sprintf("--b64-cluster-ca '%s'", *e.CABundle) } var userData bytes.Buffer userData.WriteString("#!/bin/bash -xe\n") userData.WriteString("exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1\n") - userData.WriteString(fmt.Sprintf("/etc/eks/bootstrap.sh '%s' --apiserver-endpoint='%s' %s", e.ClusterName, e.ClusterEndpoint, caBundleArg)) + // Due to the way bootstrap.sh is written, parameters should not be passed to it with an equal sign + userData.WriteString(fmt.Sprintf("/etc/eks/bootstrap.sh '%s' --apiserver-endpoint '%s' %s", e.ClusterName, e.ClusterEndpoint, caBundleArg)) kubeletExtraArgs := strings.Join([]string{e.nodeLabelArg(), e.nodeTaintArg()}, " ") if !e.AWSENILimitedPodDensity { - userData.WriteString(" \\\n--use-max-pods=false") + userData.WriteString(" \\\n--use-max-pods false") kubeletExtraArgs += " --max-pods=110" } if kubeletExtraArgs = strings.Trim(kubeletExtraArgs, " "); len(kubeletExtraArgs) > 0 { - userData.WriteString(fmt.Sprintf(" \\\n--kubelet-extra-args='%s'", kubeletExtraArgs)) + userData.WriteString(fmt.Sprintf(" \\\n--kubelet-extra-args '%s'", kubeletExtraArgs)) } if e.KubeletConfig != nil && len(e.KubeletConfig.ClusterDNS) > 0 { - userData.WriteString(fmt.Sprintf(" \\\n--dns-cluster-ip='%s'", e.KubeletConfig.ClusterDNS[0])) + userData.WriteString(fmt.Sprintf(" \\\n--dns-cluster-ip '%s'", e.KubeletConfig.ClusterDNS[0])) } return base64.StdEncoding.EncodeToString(userData.Bytes()) } diff --git a/pkg/cloudprovider/aws/suite_test.go b/pkg/cloudprovider/aws/suite_test.go index c625ab3e93de..21837e967185 100644 --- a/pkg/cloudprovider/aws/suite_test.go +++ b/pkg/cloudprovider/aws/suite_test.go @@ -630,7 +630,7 @@ var _ = Describe("Allocation", func() { Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Cardinality()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop().(*ec2.CreateLaunchTemplateInput) userData, _ := base64.StdEncoding.DecodeString(*input.LaunchTemplateData.UserData) - Expect(string(userData)).NotTo(ContainSubstring("--use-max-pods=false")) + Expect(string(userData)).NotTo(ContainSubstring("--use-max-pods false")) }) It("should specify --use-max-pods=false when not using ENI-based pod density", func() { opts.AWSENILimitedPodDensity = false @@ -640,7 +640,7 @@ var _ = Describe("Allocation", func() { Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Cardinality()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop().(*ec2.CreateLaunchTemplateInput) userData, _ := base64.StdEncoding.DecodeString(*input.LaunchTemplateData.UserData) - Expect(string(userData)).To(ContainSubstring("--use-max-pods=false")) + Expect(string(userData)).To(ContainSubstring("--use-max-pods false")) Expect(string(userData)).To(ContainSubstring("--max-pods=110")) }) Context("Kubelet Args", func() { @@ -651,7 +651,7 @@ var _ = Describe("Allocation", func() { Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Cardinality()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop().(*ec2.CreateLaunchTemplateInput) userData, _ := base64.StdEncoding.DecodeString(*input.LaunchTemplateData.UserData) - Expect(string(userData)).To(ContainSubstring("--dns-cluster-ip='10.0.10.100'")) + Expect(string(userData)).To(ContainSubstring("--dns-cluster-ip '10.0.10.100'")) }) }) Context("Instance Profile", func() {