Ensure Kubernetes version is always parsed as string

pkg/api/v1alpha1/cluster.go

@@ -265,7 +265,10 @@ type kindObject struct {
 // ParseClusterConfigFromContent unmarshalls an API object implementing the KindAccessor interface
 // from a multiobject yaml content. It doesn't set defaults nor validates the object.
 func ParseClusterConfigFromContent(content []byte, clusterConfig KindAccessor) error {
-	r := yamlutil.NewYAMLReader(bufio.NewReader(bytes.NewReader(content)))
+	kubeVersionRegex := regexp.MustCompile(constants.KubernetesVersionRegex)
+	sanitizedContent := kubeVersionRegex.ReplaceAllString(string(content), constants.QuotedKubernetesVersionRegexReplacement)
+
+	r := yamlutil.NewYAMLReader(bufio.NewReader(bytes.NewReader([]byte(sanitizedContent))))
 	for {
 		d, err := r.Read()
 		if err == io.EOF {

pkg/api/v1alpha1/testdata/cluster_1_20.yaml

@@ -10,7 +10,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_1_20_cloudstack.yaml

@@ -21,7 +21,7 @@ spec:
   datacenterRef:
     kind: CloudStackDatacenterConfig
     name: eksa-unit-test
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_1_20_namespace_mismatch_between_cluster_and_datacenter.yaml

@@ -11,7 +11,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_1_20_namespace_mismatch_between_cluster_and_machineconfigs.yaml

@@ -11,7 +11,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_1_20_with_non_eksa_resources.yaml

@@ -17,7 +17,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_invalid_cluster_name.yaml

@@ -10,7 +10,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_invalid_worker_node_count.yaml

@@ -10,7 +10,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 0
       machineGroupRef:

pkg/api/v1alpha1/testdata/cluster_package_configuration.yaml

@@ -10,7 +10,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/api/v1alpha1/testdata/incorrect_indentation.yaml

@@ -10,7 +10,7 @@ spec:
     machineGroupRef:
       name: eksa-unit-test
       kind: VSphereMachineConfig
- kubernetesVersion: "1.20"
+ kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/cluster/config_manager.go

@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1"
+	"github.com/aws/eks-anywhere/pkg/constants"
 	"github.com/aws/eks-anywhere/pkg/logger"
 )
 
@@ -113,7 +114,10 @@ type parsed struct {
 	cluster *anywherev1.Cluster
 }
 
-var separatorRegex = regexp.MustCompile(`(?m)^---$`)
+var (
+	separatorRegex   = regexp.MustCompile(`(?m)^---$`)
+	kubeVersionRegex = regexp.MustCompile(constants.KubernetesVersionRegex)
+)
 
 func (c *ConfigManager) unmarshal(yamlManifest []byte) (*parsed, error) {
 	parsed := &parsed{
@@ -122,9 +126,9 @@ func (c *ConfigManager) unmarshal(yamlManifest []byte) (*parsed, error) {
 	yamlObjs := separatorRegex.Split(string(yamlManifest), -1)
 
 	for _, yamlObj := range yamlObjs {
-		trimmedYamlObj := strings.TrimSuffix(yamlObj, "\n")
+		sanitizedYamlObj := kubeVersionRegex.ReplaceAllString(strings.TrimSuffix(yamlObj, "\n"), constants.QuotedKubernetesVersionRegexReplacement)
 		k := &basicAPIObject{}
-		err := yaml.Unmarshal([]byte(trimmedYamlObj), k)
+		err := yaml.Unmarshal([]byte(sanitizedYamlObj), k)
 		if err != nil {
 			return nil, err
 		}
@@ -154,7 +158,7 @@ func (c *ConfigManager) unmarshal(yamlManifest []byte) (*parsed, error) {
 			continue
 		}
 
-		if err := yaml.Unmarshal([]byte(trimmedYamlObj), obj); err != nil {
+		if err := yaml.Unmarshal([]byte(sanitizedYamlObj), obj); err != nil {
 			return nil, err
 		}
 		parsed.objects.add(obj)

pkg/cluster/testdata/cluster_1_19.yaml

@@ -30,7 +30,7 @@ spec:
         kind: VSphereMachineConfig
         name: eksa-unit-test
     - name: workers-2
-      kubernetesVersion: "1.20"
+      kubernetesVersion: 1.20
       count: 1
       machineGroupRef:
         kind: VSphereMachineConfig

pkg/cluster/testdata/cluster_1_20_cloudstack.yaml

@@ -21,7 +21,7 @@ spec:
   datacenterRef:
     kind: CloudStackDatacenterConfig
     name: eksa-unit-test
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/cluster/testdata/cluster_cloudstack_missing_datacenter.yaml

@@ -21,7 +21,7 @@ spec:
   datacenterRef:
     kind: CloudStackDatacenterConfig
     name: eksa-unit-test
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   workerNodeGroupConfigurations:
     - count: 3
       machineGroupRef:

pkg/cluster/testdata/docker_cluster_oidc_awsiam_flux.yaml

@@ -21,7 +21,7 @@ spec:
     name: m-docker
   workerNodeGroupConfigurations:
   - name: workers-1
-    kubernetesVersion: "1.20"
+    kubernetesVersion: 1.20
     count: 1
   identityProviderRefs:
   - kind: OIDCConfig

pkg/constants/constants.go

@@ -76,6 +76,13 @@ const (
 	// DefaultcuratedPackagesRegistry is a containerd compatible registry format that matches all AWS regions.
 	DefaultCuratedPackagesRegistry = "783794618700.dkr.ecr.*.amazonaws.com"
 
+	// KubernetesVersionRegex matches the Kubernetes version field in the cluster config.
+	KubernetesVersionRegex = `(?m)(.*kubernetesVersion:\s*)['"]?(1\.[0-9]{2,})['"]?(.*)$`
+
+	// QuoteRegexReplacement is the target replacement pattern which will add quotes around the Kubernetes version
+	// in the cluster config.
+	QuotedKubernetesVersionRegexReplacement = `${1}"${2}"${3}`
+
 	// Provider specific env vars.
 	VSphereUsernameKey     = "VSPHERE_USERNAME"
 	VSpherePasswordKey     = "VSPHERE_PASSWORD"

pkg/dependencies/testdata/cluster_tinkerbell.yaml

@@ -22,7 +22,7 @@ spec:
   datacenterRef:
     kind: TinkerbellDatacenterConfig
     name: eksa-unit-test
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   managementCluster:
     name: eksa-unit-test
   workerNodeGroupConfigurations:

pkg/providers/cloudstack/testdata/cluster_main_worker_node_group_kubernetes_version.yaml

@@ -31,7 +31,7 @@ spec:
   workerNodeGroupConfigurations:
   - count: 3
     name: md-0
-    kubernetesVersion: "1.20"
+    kubernetesVersion: 1.20
     machineGroupRef:
       kind: CloudStackMachineConfig
       name: test-md-0

pkg/providers/nutanix/testdata/eksa-cluster-external-etcd-k8s-1-20.yaml

@@ -4,7 +4,7 @@ metadata:
   name: eksa-unit-test
   namespace: default
 spec:
-  kubernetesVersion: "1.20"
+  kubernetesVersion: 1.20
   controlPlaneConfiguration:
     name: eksa-unit-test-cp
     count: 3

pkg/providers/tinkerbell/testdata/cluster_tinkerbell_worker_version.yaml

@@ -35,7 +35,7 @@ spec:
     name: test
   workerNodeGroupConfigurations:
   - count: 1
-    kubernetesVersion: "1.20"
+    kubernetesVersion: 1.20
     name: md-0
     machineGroupRef:
       name: test-md

pkg/utils/yaml/yaml.go

@@ -1,12 +1,9 @@
 package yaml
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
-	"io"
 
-	apiyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/yaml"
 )
 
@@ -28,23 +25,3 @@ func Serialize[T any](objs ...T) ([][]byte, error) {
 	}
 	return r, nil
 }
-
-// SplitDocuments function splits content into individual document parts represented as byte slices.
-func SplitDocuments(r io.Reader) ([][]byte, error) {
-	resources := make([][]byte, 0)
-
-	yr := apiyaml.NewYAMLReader(bufio.NewReader(r))
-	for {
-		d, err := yr.Read()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		resources = append(resources, d)
-	}
-
-	return resources, nil
-}

pkg/utils/yaml/yaml_test.go

@@ -1,99 +1,70 @@
 package yaml_test
 
 import (
-	"bufio"
-	"errors"
-	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	yamlutil "github.com/aws/eks-anywhere/pkg/utils/yaml"
 )
 
-func TestSplitDocuments(t *testing.T) {
+func TestJoinDocuments(t *testing.T) {
 	tests := []struct {
-		name         string
-		input        string
-		expectedDocs [][]byte
-		expectedErr  error
+		name   string
+		input  [][]byte
+		output []byte
 	}{
 		{
-			name:         "Empty input",
-			input:        "",
-			expectedDocs: [][]byte{},
-			expectedErr:  nil,
+			name:   "Empty input",
+			input:  [][]byte{},
+			output: []byte{},
 		},
 		{
 			name: "Single document",
-			input: `apiVersion: v1
+			input: [][]byte{
+				[]byte(`apiVersion: v1
 kind: Pod
 metadata:
   name: pod-1
-`,
-			expectedDocs: [][]byte{
-				[]byte(`apiVersion: v1
+`),
+			},
+			output: []byte(`apiVersion: v1
 kind: Pod
 metadata:
   name: pod-1
 `),
-			},
-			expectedErr: nil,
 		},
 		{
 			name: "Multiple documents",
-			input: `apiVersion: v1
+			input: [][]byte{
+				[]byte(`apiVersion: v1
 kind: Pod
 metadata:
   name: pod-1
----
-apiVersion: v1
+`),
+				[]byte(`apiVersion: v1
 kind: Service
 metadata:
   name: service-1
-`,
-			expectedDocs: [][]byte{
-				[]byte(`apiVersion: v1
+`),
+			},
+			output: []byte(`apiVersion: v1
 kind: Pod
 metadata:
   name: pod-1
-`),
-				[]byte(`apiVersion: v1
+
+---
+apiVersion: v1
 kind: Service
 metadata:
   name: service-1
 `),
-			},
-			expectedErr: nil,
-		},
-		{
-			name:         "Error reading input 2",
-			input:        `---\nkey: value\ninvalid_separator\n`,
-			expectedDocs: nil,
-			expectedErr:  errors.New("invalid Yaml document separator: \\nkey: value\\ninvalid_separator\\n"),
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			r := strings.NewReader(test.input)
-
-			docs, err := yamlutil.SplitDocuments(bufio.NewReader(r))
-			if test.expectedErr != nil {
-				assert.Equal(t, test.expectedErr.Error(), err.Error())
-				assert.Equal(t, len(test.expectedDocs), len(docs))
-			} else {
-				require.NoError(t, err)
-				if len(docs) != len(test.expectedDocs) {
-					t.Errorf("Expected %d documents, but got %d", len(test.expectedDocs), len(docs))
-				}
-
-				for i, doc := range docs {
-					if string(doc) != string(test.expectedDocs[i]) {
-						t.Errorf("Document %d mismatch.\nExpected:\n%s\nGot:\n%s", i+1, string(test.expectedDocs[i]), string(doc))
-					}
-				}
+			joinedDoc := yamlutil.Join(test.input)
+			if string(joinedDoc) != string(test.output) {
+				t.Errorf("Document mismatch.\nExpected:\n%s\nGot:\n%s", string(test.output), string(joinedDoc))
 			}
 		})
 	}