Move YAML parser to kubernetes-sig/yaml

Author: Jonathan S. Katz

Gopkg.lock

@@ -47,10 +47,6 @@ required = [
   branch = "master"
   name = "golang.org/x/crypto"
 
-[[constraint]]
-  name = "gopkg.in/yaml.v2"
-  version = "2.2.8"
-
 [[constraint]]
   name = "k8s.io/api"
   version = "0.17.4"

Gopkg.toml

@@ -18,8 +18,9 @@ limitations under the License.
 import (
 	"bytes"
 	"errors"
+
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 )
 
 type LoadConfig struct {

apiserver/loadservice/loadconfig.go

@@ -26,11 +26,13 @@ import (
 
 	crv1 "github.com/crunchydata/postgres-operator/apis/crunchydata.com/v1"
 	"github.com/crunchydata/postgres-operator/kubeapi"
+
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/client-go/kubernetes"
+	"sigs.k8s.io/yaml"
 )
 
 const CustomConfigMapName = "pgo-config"
@@ -393,20 +395,6 @@ func (c *PgoConfig) Validate() error {
 	return err
 }
 
-func (c *PgoConfig) GetConf() *PgoConfig {
-
-	yamlFile, err := ioutil.ReadFile(CONFIG_PATH)
-	if err != nil {
-		log.Printf("yamlFile.Get err   #%v ", err)
-	}
-	err = yaml.Unmarshal(yamlFile, c)
-	if err != nil {
-		log.Fatalf("Unmarshal: %v", err)
-	}
-
-	return c
-}
-
 // GetPodAntiAffinitySpec accepts possible user-defined values for what the
 // pod anti-affinity spec should be, which include rules for:
 // - PostgreSQL instances

config/pgoconfig.go

@@ -18,11 +18,13 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
 	"github.com/crunchydata/postgres-operator/pgo/api"
+
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
-	"os"
+	"sigs.k8s.io/yaml"
 )
 
 func showConfig(args []string, ns string) {