replace yaml package

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
@@ -14,38 +15,38 @@ import (
 
 type (
 	Config struct {
-		Pools []PoolConfig `yaml:"pools"`
+		Pools []PoolConfig `json:"pools"`
 	}
 
 	PoolConfig struct {
-		Name     string               `yaml:"pool"`
-		Continue bool                 `yaml:"continue"`
-		Selector []PoolConfigSelector `yaml:"selector"`
-		Node     PoolConfigNode       `yaml:"node"`
+		Name     string               `json:"pool"`
+		Continue bool                 `json:"continue"`
+		Selector []PoolConfigSelector `json:"selector"`
+		Node     PoolConfigNode       `json:"node"`
 	}
 
 	PoolConfigSelector struct {
-		Path     string `yaml:"path"`
+		Path     string `json:"path"`
 		jsonPath *jsonpath.JSONPath
-		Match    *string `yaml:"match"`
-		Regexp   *string `yaml:"regexp"`
+		Match    *string `json:"match"`
+		Regexp   *string `json:"regexp"`
 		regexp   *regexp.Regexp
 	}
 
 	PoolConfigNode struct {
-		Roles        PoolConfigNodeValueMap      `yaml:"roles"`
-		JsonPatches  []k8s.JsonPatchObject       `yaml:"jsonPatches"`
-		ConfigSource *PoolConfigNodeConfigSource `yaml:"configSource"`
-		Labels       PoolConfigNodeValueMap      `yaml:"labels"`
-		Annotations  PoolConfigNodeValueMap      `yaml:"annotations"`
+		Roles        PoolConfigNodeValueMap      `json:"roles"`
+		JsonPatches  []k8s.JsonPatchObject       `json:"jsonPatches"`
+		ConfigSource *PoolConfigNodeConfigSource `json:"configSource"`
+		Labels       PoolConfigNodeValueMap      `json:"labels"`
+		Annotations  PoolConfigNodeValueMap      `json:"annotations"`
 	}
 
 	PoolConfigNodeConfigSource struct {
 		ConfigMap struct {
-			Name             string `yaml:"name" json:"name"`
-			Namespace        string `yaml:"namespace" json:"namespace"`
-			KubeletConfigKey string `yaml:"kubeletConfigKey" json:"kubeletConfigKey"`
-		} `yaml:"configMap" json:"configMap"`
+			Name             string `json:"name"`
+			Namespace        string `json:"namespace"`
+			KubeletConfigKey string `json:"kubeletConfigKey"`
+		} `json:"configMap"`
 	}
 
 	PoolConfigNodeValueMap struct {
@@ -63,12 +64,12 @@ func (valueMap *PoolConfigNodeValueMap) Entries() map[string]*string {
 	return mapList
 }
 
-func (valueMap *PoolConfigNodeValueMap) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (valueMap *PoolConfigNodeValueMap) UnmarshalJSON(b []byte) error {
 	mapList := map[string]*string{}
-	err := unmarshal(&mapList)
+	err := json.Unmarshal(b, &mapList)
 	if err != nil {
 		var stringList []string
-		err := unmarshal(&stringList)
+		err := json.Unmarshal(b, &stringList)
 		if err != nil {
 			return err
 		}

example.yaml

@@ -21,7 +21,7 @@ pools:
         match: "windows"
     node:
       # sets the kubernetes node role
-      role: [windows]
+      roles: [windows]
 
   - pool: azure
     selector:

main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/jessevdk/go-flags"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/webdevops/kube-pool-manager/config"
 	"github.com/webdevops/kube-pool-manager/manager"
@@ -73,14 +73,13 @@ func parseAppConfig(path string) (conf config.Config) {
 
 	logger.With(zap.String("path", path)).Infof("reading configuration from file %v", path)
 	/* #nosec */
-	if data, err := os.ReadFile(path); err == nil {
-		configRaw = data
-	} else {
-		logger.Fatal(err)
+	configRaw, err := os.ReadFile(path)
+	if err != nil {
+		logger.Fatal(err.Error())
 	}
 
 	logger.With(zap.String("path", path)).Info("parsing configuration")
-	if err := yaml.Unmarshal(configRaw, &conf); err != nil {
+	if err := yaml.UnmarshalStrict(configRaw, &conf); err != nil {
 		logger.Fatal(err)
 	}