diff --git a/go.mod b/go.mod index f39170d3..cea9ea2e 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/sykesm/zap-logfmt v0.0.4 go.uber.org/mock v0.4.0 go.uber.org/zap v1.27.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.35.1 k8s.io/apimachinery v0.35.1 k8s.io/client-go v0.35.1 @@ -131,7 +131,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/apiextensions-apiserver v0.35.1 // indirect k8s.io/code-generator v0.35.1 // indirect k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect diff --git a/pkg/configmanager/config.go b/pkg/configmanager/config.go index c4f32ade..79fdc678 100644 --- a/pkg/configmanager/config.go +++ b/pkg/configmanager/config.go @@ -4,12 +4,13 @@ import ( "context" "fmt" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) // ConfigManagerBuilder is an interface describing the functions of a cluster upgrader. +// //go:generate mockgen -destination=mocks/configmanagerbuilder.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/configmanager ConfigManagerBuilder type ConfigManagerBuilder interface { New(client.Client, Target) ConfigManager @@ -30,6 +31,7 @@ func NewBuilder() ConfigManagerBuilder { } // ConfigManager is an interface describing the functions of a cluster upgrader. +// //go:generate mockgen -destination=mocks/configmanager.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/configmanager ConfigManager type ConfigManager interface { Into(ConfigValidator) error