Merge branch 'develop' into remove-direct-apimachinery

changelog/james-prysm_remove-direct-apimachinery.md

@@ -0,0 +1,3 @@
+### Removed
+
+- removed direct dependency of k8s.io/apimachinery introduced in https://github.com/OffchainLabs/prysm/pull/12354

config/BUILD.bazel

@@ -21,9 +21,9 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_ethereum_go_ethereum//common:go_default_library",
+        "@com_github_ghodss_yaml//:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
-        "@io_k8s_apimachinery//pkg/util/yaml:go_default_library",
     ],
 )
 

config/util.go

@@ -11,9 +11,10 @@ import (
 	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ghodss/yaml"
+
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/apimachinery/pkg/util/yaml"
 )
 
 func UnmarshalFromURL(ctx context.Context, from string, to any) error {

consensus-types/validator/BUILD.bazel

@@ -17,6 +17,6 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//testing/require:go_default_library",
-        "@io_k8s_apimachinery//pkg/util/yaml:go_default_library",
+        "@com_github_ghodss_yaml//:go_default_library",
     ],
 )

go.mod

@@ -99,7 +99,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	honnef.co/go/tools v0.6.0
-	k8s.io/apimachinery v0.30.4
 	k8s.io/client-go v0.30.4
 )
 
@@ -274,6 +273,7 @@ require (
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	k8s.io/apimachinery v0.30.4 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect