Merge pull request #67 from Azure/swei/yamlvalueapplier

*: support YAML values applier

Author: fuweid

go.mod

@@ -16,6 +16,7 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubectl v0.28.4
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -143,5 +144,4 @@ require (
 	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
 )

go.sum

@@ -529,5 +529,5 @@ sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM
 sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

helmcli/release.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"gopkg.in/yaml.v2"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/storage/driver"
@@ -40,6 +41,47 @@ func StringPathValuesApplier(values ...string) ValuesApplier {
 	}
 }
 
+func YAMLValuesApplier(yamlValues string) (ValuesApplier, error) {
+	values := make(map[string]interface{})
+	err := yaml.Unmarshal([]byte(yamlValues), &values)
+	if err != nil {
+		return nil, err
+	}
+
+	return func(to map[string]interface{}) error {
+		return applyValues(to, values)
+	}, nil
+}
+
+func applyValues(to, from map[string]interface{}) error {
+	for k, v := range from {
+		// If 'to' doesn't have key 'k'
+		if _, checkKey := to[k]; !checkKey {
+			to[k] = v
+			continue
+		}
+
+		// If 'to' has key 'k'
+		switch v := v.(type) {
+		case map[string]interface{}:
+			// If 'v' is of type map[string]interface{}
+			if toMap, checkKey := to[k].(map[string]interface{}); checkKey {
+				if err := applyValues(toMap, v); err != nil {
+					return err
+				}
+			} else {
+				to[k] = v
+
+			}
+		default:
+			// If 'v' is not of type map[string]interface{}
+			to[k] = v
+		}
+
+	}
+	return nil
+}
+
 // ReleaseCli is a client to deploy helm chart with secret storage.
 type ReleaseCli struct {
 	namespace string

helmcli/release_test.go

@@ -0,0 +1,105 @@
+package helmcli
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestApplyValues(t *testing.T) {
+	for idx, tc := range []struct {
+		from     map[string]interface{}
+		to       map[string]interface{}
+		expected map[string]interface{}
+	}{
+		{
+			from: map[string]interface{}{
+				"foo": "bar1",
+				"baz": map[string]interface{}{
+					"name": "alice",
+				},
+			},
+			to: map[string]interface{}{
+				"foo": "bar2",
+				"baz": map[string]interface{}{
+					"name": "bob",
+					"age":  "18",
+				},
+			},
+			expected: map[string]interface{}{
+				"foo": "bar1",
+				"baz": map[string]interface{}{
+					"name": "alice",
+					"age":  "18",
+				},
+			},
+		},
+		{
+			from: map[string]interface{}{
+				"foo": "bar1",
+				"baz": "profile",
+			},
+			to: map[string]interface{}{
+				"foo": "bar1",
+				"baz": map[string]interface{}{
+					"name": "alice",
+				},
+			},
+			expected: map[string]interface{}{
+				"foo": "bar1",
+				"baz": "profile",
+			},
+		},
+		{
+			from: map[string]interface{}{
+				"foo": "bar1",
+				"baz": map[string]interface{}{
+					"name": "alice",
+				},
+			},
+			to: map[string]interface{}{
+				"version": "alpha",
+			},
+			expected: map[string]interface{}{
+				"foo": "bar1",
+				"baz": map[string]interface{}{
+					"name": "alice",
+				},
+				"version": "alpha",
+			},
+		},
+		{
+			from: map[string]interface{}{
+				"baz": map[string]interface{}{
+					"name": map[string]interface{}{
+						"last":  "unknown",
+						"first": "bob",
+					},
+				},
+				"version": "beta",
+			},
+			to: map[string]interface{}{
+				"foo": "bar2",
+				"baz": map[string]interface{}{
+					"name": "bob",
+					"age":  "18",
+				},
+			},
+			expected: map[string]interface{}{
+				"foo": "bar2",
+				"baz": map[string]interface{}{
+					"name": map[string]interface{}{
+						"last":  "unknown",
+						"first": "bob",
+					},
+					"age": "18",
+				},
+				"version": "beta",
+			},
+		},
+	} {
+		err := applyValues(tc.to, tc.from)
+		assert.NoError(t, err, "#%v", idx)
+		assert.Equal(t, tc.expected, tc.to, "#%v", idx)
+	}
+}

virtualcluster/nodes_common.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/Azure/kperf/helmcli"
+	"sigs.k8s.io/yaml"
 )
 
 var (
@@ -98,12 +99,25 @@ func WithNodepoolNodeControllerAffinity(nodeSelectors map[string][]string) Nodep
 // NOTE: Please align with ../manifests/virtualcluster/nodes/values.yaml
 //
 // TODO: Add YAML ValuesAppliers to support array type.
-func (cfg *nodepoolConfig) toHelmValuesAppliers(nodepoolName string) []helmcli.ValuesApplier {
+func (cfg *nodepoolConfig) toHelmValuesAppliers(nodepoolName string) ([]helmcli.ValuesApplier, error) {
 	res := make([]string, 0, 4)
 
 	res = append(res, fmt.Sprintf("name=%s", nodepoolName))
 	res = append(res, fmt.Sprintf("replicas=%d", cfg.count))
 	res = append(res, fmt.Sprintf("cpu=%d", cfg.cpu))
 	res = append(res, fmt.Sprintf("memory=%d", cfg.memory))
-	return []helmcli.ValuesApplier{helmcli.StringPathValuesApplier(res...)}
+
+	stringPathApplier := helmcli.StringPathValuesApplier(res...)
+
+	// Marshal nodeSelectors to YAML
+	nodeSelectorsYaml, err := yaml.Marshal(cfg.nodeSelectors)
+	if err != nil {
+		return nil, err
+	}
+	// Create YAML ValuesAppliers nodeSelectors
+	nodeSelectorsApplier, err := helmcli.YAMLValuesApplier(string(nodeSelectorsYaml))
+	if err != nil {
+		return nil, err
+	}
+	return []helmcli.ValuesApplier{stringPathApplier, nodeSelectorsApplier}, nil
 }

virtualcluster/nodes_create.go

@@ -39,13 +39,17 @@ func CreateNodepool(ctx context.Context, kubeconfigPath string, nodepoolName str
 		return fmt.Errorf("failed to load virtual node chart: %w", err)
 	}
 
+	cfgValues, err := cfg.toHelmValuesAppliers(nodepoolName)
+	if err != nil {
+		return fmt.Errorf("failed to convert to helm values: %w", err)
+	}
 	releaseCli, err := helmcli.NewReleaseCli(
 		kubeconfigPath,
 		virtualnodeReleaseNamespace,
 		nodepoolName,
 		ch,
 		virtualnodeReleaseLabels,
-		cfg.toHelmValuesAppliers(nodepoolName)...,
+		cfgValues...,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create helm release client: %w", err)