fix: handle runtime.Rawextension properly

Author: faiq

bootstrap/eks/internal/userdata/nodeadm.go

@@ -97,8 +97,8 @@ spec:
   {{- end }}
   kubelet:
     {{- if .KubeletConfig }}
-    config: |
-{{ Indent 6 .KubeletConfig }}
+    config:
+{{ Indent 6 (toYaml .KubeletConfig) }}
     {{- end }}
     flags:
     {{- range $flag := .KubeletFlags }}
@@ -107,12 +107,12 @@ spec:
   {{- if or .ContainerdConfig .ContainerdBaseRuntimeSpec }}
   containerd:
     {{- if .ContainerdConfig }}
-    config: |
+    config:
 {{ Indent 6 .ContainerdConfig }}
     {{- end }}
     {{- if .ContainerdBaseRuntimeSpec }}
-    baseRuntimeSpec: |
-{{ Indent 6 .ContainerdBaseRuntimeSpec}}
+    baseRuntimeSpec:
+{{ Indent 6 (toYaml .ContainerdBaseRuntimeSpec) }}
     {{- end }}
   {{- end }}
   {{- if .Instance }}
@@ -238,7 +238,6 @@ func validateNodeadmInput(input *NodeadmInput) error {
 	if input.NodeGroupName == "" {
 		return fmt.Errorf("node group name is required for nodeadm")
 	}
-
 	if input.Boundary == "" {
 		input.Boundary = boundary
 	}

bootstrap/eks/internal/userdata/nodeadm_test.go

@@ -23,6 +23,7 @@ import (
 
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/ptr"
 
 	eksbootstrapv1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
@@ -168,11 +169,12 @@ func TestNodeadmUserdata(t *testing.T) {
 					APIServerEndpoint: "https://example.com",
 					CACert:            "test-ca-cert",
 					NodeGroupName:     "test-nodegroup",
-					KubeletConfig: `
+					KubeletConfig: &runtime.RawExtension{
+						Raw: []byte(`
 evictionHard:
   memory.available: "2000Mi"
-
-					`,
+						`),
+					},
 				},
 			},
 			expectErr: false,

bootstrap/eks/internal/userdata/utils.go

@@ -17,13 +17,19 @@ limitations under the License.
 package userdata
 
 import (
+	"fmt"
 	"strings"
 	"text/template"
+
+	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/yaml"
 )
 
 var (
 	defaultTemplateFuncMap = template.FuncMap{
 		"Indent": templateYAMLIndent,
+		"toYaml": templateToYAML,
 	}
 )
 
@@ -32,3 +38,28 @@ func templateYAMLIndent(i int, input string) string {
 	ident := "\n" + strings.Repeat(" ", i)
 	return strings.Repeat(" ", i) + strings.Join(split, ident)
 }
+
+func templateToYAML(r *runtime.RawExtension) (string, error) {
+	if r == nil {
+		return "", nil
+	}
+	if r.Object != nil {
+		b, err := yaml.Marshal(r.Object)
+		if err != nil {
+			return "", errors.Wrap(err, "failed to convert to yaml")
+		}
+		return string(b), nil
+	}
+	if len(r.Raw) > 0 {
+		if yb, err := yaml.JSONToYAML(r.Raw); err == nil {
+			return string(yb), nil
+		}
+		var temp interface{}
+		err := yaml.Unmarshal(r.Raw, &temp)
+		if err == nil {
+			return string(r.Raw), nil
+		}
+		return "", fmt.Errorf("runtime object raw is neither json nor yaml %s", string(r.Raw))
+	}
+	return "", nil
+}