fix: allow user-data mime content-type before mime-version header (aw…

…s#4584)
engedaam · Sep 7, 2023 · a90c158 · a90c158
1 parent 2e9bcb8
commit a90c158
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/pkg/providers/amifamily/bootstrap/eksbootstrap.go b/pkg/providers/amifamily/bootstrap/eksbootstrap.go
@@ -123,7 +123,8 @@ func (e EKS) isIPv6() bool {
 // mimeify returns userData in a mime format
 // if the userData passed in is already in a mime format, then the input is returned without modification
 func (e EKS) mimeify(customUserData string) (string, error) {
-	if strings.HasPrefix(strings.TrimSpace(customUserData), "MIME-Version:") {
+	if strings.HasPrefix(strings.TrimSpace(customUserData), "MIME-Version:") ||
+		strings.HasPrefix(strings.TrimSpace(customUserData), "Content-Type:") {
 		return customUserData, nil
 	}
 	var outputBuffer bytes.Buffer

diff --git a/pkg/providers/launchtemplate/suite_test.go b/pkg/providers/launchtemplate/suite_test.go
@@ -1418,6 +1418,25 @@ var _ = Describe("LaunchTemplates", func() {
 				expectedUserData := fmt.Sprintf(string(content), newProvisioner.Name)
 				ExpectLaunchTemplatesCreatedWithUserData(expectedUserData)
 			})
+			It("should merge in custom user data when Content-Type is before MIME-Version", func() {
+				ctx = settings.ToContext(ctx, test.Settings(test.SettingOptions{
+					EnableENILimitedPodDensity: lo.ToPtr(false),
+				}))
+
+				content, err := os.ReadFile("testdata/al2_userdata_content_type_first_input.golden")
+				Expect(err).To(BeNil())
+				nodeTemplate.Spec.UserData = aws.String(string(content))
+				ExpectApplied(ctx, env.Client, nodeTemplate)
+				newProvisioner := test.Provisioner(coretest.ProvisionerOptions{ProviderRef: &v1alpha5.MachineTemplateRef{Name: nodeTemplate.Name}})
+				ExpectApplied(ctx, env.Client, newProvisioner)
+				pod := coretest.UnschedulablePod()
+				ExpectProvisioned(ctx, env.Client, cluster, cloudProvider, prov, pod)
+				ExpectScheduled(ctx, env.Client, pod)
+				content, err = os.ReadFile("testdata/al2_userdata_merged.golden")
+				Expect(err).To(BeNil())
+				expectedUserData := fmt.Sprintf(string(content), newProvisioner.Name)
+				ExpectLaunchTemplatesCreatedWithUserData(expectedUserData)
+			})
 			It("should merge in custom user data not in multi-part mime format", func() {
 				ctx = settings.ToContext(ctx, test.Settings(test.SettingOptions{
 					EnableENILimitedPodDensity: lo.ToPtr(false),

diff --git a/pkg/providers/launchtemplate/testdata/al2_userdata_content_type_first_input.golden b/pkg/providers/launchtemplate/testdata/al2_userdata_content_type_first_input.golden
@@ -0,0 +1,10 @@
+Content-Type: multipart/mixed; boundary="BOUNDARY"
+MIME-Version: 1.0
+
+--BOUNDARY
+Content-Type: text/x-shellscript; charset="us-ascii"
+
+#!/bin/bash
+echo "Running custom user data script"
+
+--BOUNDARY--