From 9bdc394474c79e74c389041425fbfb0532cb542c Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Mon, 17 Feb 2025 12:10:40 +0100 Subject: [PATCH] chore(deps): Switch to sigs.k8s.io/yaml Current unmaintained module `github.com/ghodss/yaml` can be replaced by the maintained fork maintained by k8s community. Signed-off-by: Mikel Olasagasti Uranga --- go.mod | 4 +--- go.sum | 2 -- pkg/builtinchecks/built_in_checks.go | 2 +- pkg/command/common/template.go | 2 +- pkg/lintcontext/parse_yaml.go | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index cbc945a7e..fa8e66a20 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/bmatcuk/doublestar/v4 v4.8.1 github.com/cert-manager/cert-manager v1.17.0 github.com/fatih/color v1.18.0 - github.com/ghodss/yaml v1.0.0 github.com/kedacore/keda/v2 v2.16.1 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.5.0 @@ -24,6 +23,7 @@ require ( k8s.io/apimachinery v0.32.1 k8s.io/client-go v0.32.1 k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -146,7 +146,6 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.32.0 // indirect k8s.io/cli-runtime v0.32.0 // indirect @@ -163,5 +162,4 @@ require ( sigs.k8s.io/kustomize/api v0.18.0 // indirect sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 1f2b91cc8..d872874e7 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,6 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= diff --git a/pkg/builtinchecks/built_in_checks.go b/pkg/builtinchecks/built_in_checks.go index 3408fe5d8..11cb11021 100644 --- a/pkg/builtinchecks/built_in_checks.go +++ b/pkg/builtinchecks/built_in_checks.go @@ -6,10 +6,10 @@ import ( "path/filepath" "sync" - "github.com/ghodss/yaml" "github.com/pkg/errors" "golang.stackrox.io/kube-linter/pkg/checkregistry" "golang.stackrox.io/kube-linter/pkg/config" + "sigs.k8s.io/yaml" ) var ( diff --git a/pkg/command/common/template.go b/pkg/command/common/template.go index 73b71222e..965f467c1 100644 --- a/pkg/command/common/template.go +++ b/pkg/command/common/template.go @@ -4,7 +4,7 @@ import ( "strings" "text/template" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/Masterminds/sprig/v3" "github.com/fatih/color" diff --git a/pkg/lintcontext/parse_yaml.go b/pkg/lintcontext/parse_yaml.go index 605d06317..04ed2bfdf 100644 --- a/pkg/lintcontext/parse_yaml.go +++ b/pkg/lintcontext/parse_yaml.go @@ -11,7 +11,6 @@ import ( "strings" "github.com/bmatcuk/doublestar/v4" - y "github.com/ghodss/yaml" kedaV1Alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1" ocsAppsV1 "github.com/openshift/api/apps/v1" ocpSecV1 "github.com/openshift/api/security/v1" @@ -29,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/kubernetes/scheme" + y "sigs.k8s.io/yaml" ) const (