Update direct golang deps

pkg/discover/discover.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/jinzhu/copier"
 
-	gyaml "github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"github.com/openshift-knative/hack/pkg/action"
 	"github.com/openshift-knative/hack/pkg/konfluxgen"
@@ -285,7 +285,7 @@ func readYaml(path string, out any) error {
 	if err != nil {
 		return fmt.Errorf("failed to read %q: %w", path, err)
 	}
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return fmt.Errorf("failed to convert %q to JSON: %w", path, err)
 	}
@@ -305,7 +305,7 @@ func writeYaml(path string, out any) error {
 	if err != nil {
 		return err
 	}
-	y, err := gyaml.JSONToYAML(j)
+	y, err := yaml.JSONToYAML(j)
 	if err != nil {
 		return err
 	}

pkg/dockerfilegen/generator.go

@@ -26,10 +26,10 @@ import (
 	"github.com/openshift-knative/hack/pkg/rhel"
 	"github.com/openshift-knative/hack/pkg/util"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 	"golang.org/x/mod/modfile"
 	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"slices"
 )
 
 const (

pkg/k8sresource/meta.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	gyaml "github.com/ghodss/yaml"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 )
 
 func Metadata(yamlFilePath string) (*metav1.PartialObjectMetadata, error) {
@@ -24,7 +24,7 @@ func unmarshalYaml[T interface{}](yamlFilePath string, target *T) error {
 		return fmt.Errorf("failed to read file: %w", err)
 	}
 
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return fmt.Errorf("failed to convert yaml file to json: %w", err)
 	}

pkg/konfluxgen/konfluxgen.go

@@ -30,9 +30,9 @@ import (
 	"github.com/openshift-knative/hack/pkg/soversion"
 	"github.com/openshift-knative/hack/pkg/util"
 
-	gyaml "github.com/ghodss/yaml"
 	cioperatorapi "github.com/openshift/ci-tools/pkg/api"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"sigs.k8s.io/yaml"
 )
 
 const (
@@ -724,7 +724,7 @@ func parseConfig(path string) (*cioperatorapi.ReleaseBuildConfiguration, error)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file %q: %w", path, err)
 	}
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert YAML to JSON: %w", err)
 	}
@@ -1251,7 +1251,7 @@ func loadClusterServiceVerion(path string) (*operatorsv1alpha1.ClusterServiceVer
 	if err != nil {
 		return nil, err
 	}
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return nil, err
 	}

pkg/prowcopy/prowcopy.go

@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	gyaml "github.com/ghodss/yaml"
 	cioperatorapi "github.com/openshift/ci-tools/pkg/api"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/utils/pointer"
+	"sigs.k8s.io/yaml"
 
 	"github.com/openshift-knative/hack/pkg/prowgen"
 )
@@ -183,7 +183,7 @@ func getJobConfig(match string, c Config) (*prowgen.ReleaseBuildConfiguration, e
 	if err != nil {
 		return nil, err
 	}
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return nil, err
 	}

pkg/prowgen/prowgen.go

@@ -27,7 +27,6 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/coreos/go-semver/semver"
-	gyaml "github.com/ghodss/yaml"
 	"golang.org/x/sync/errgroup"
 	prowapi "sigs.k8s.io/prow/pkg/apis/prowjobs/v1"
 	prowconfig "sigs.k8s.io/prow/pkg/config"
@@ -201,8 +200,8 @@ func LoadConfig(path string) (*Config, error) {
 	return UnmarshalConfig(y)
 }
 
-func UnmarshalConfig(yaml []byte) (*Config, error) {
-	j, err := gyaml.YAMLToJSON(yaml)
+func UnmarshalConfig(rawYaml []byte) (*Config, error) {
+	j, err := yaml.YAMLToJSON(rawYaml)
 	if err != nil {
 		return nil, err
 	}
@@ -520,7 +519,7 @@ func GetJobConfig(match string) (*prowconfig.JobConfig, error) {
 	if err != nil {
 		return nil, err
 	}
-	j, err := gyaml.YAMLToJSON(y)
+	j, err := yaml.YAMLToJSON(y)
 	if err != nil {
 		return nil, err
 	}

pkg/testselect/testselect.go

@@ -1,6 +1,7 @@
 package testselect
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"flag"
@@ -11,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/openshift-knative/hack/pkg/prowgen"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"sigs.k8s.io/prow/pkg/clonerefs"
 )
 
@@ -60,7 +61,9 @@ func Main() {
 	}
 
 	testSuites := new(TestSuites)
-	if err := yaml.UnmarshalStrict(inTs, testSuites); err != nil {
+	dec := yaml.NewDecoder(bytes.NewReader(inTs))
+	dec.KnownFields(true)
+	if err := dec.Decode(testSuites); err != nil {
 		log.Fatalln("Unmarshal test suite mappings", err)
 	}