chore(dep): replace github.com/ghodss/yaml with sigs.k8s.io/yaml (#687)

* chore: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml` At the time of making this commit, the package `github.com/ghodss/yaml` is no longer actively maintained. `sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively maintained by Kubernetes SIG. Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Niladri Halder <[email protected]> * chore(changelog): update changelog with PR #685's changes Signed-off-by: Niladri Halder <[email protected]> --------- Signed-off-by: Eng Zer Jun <[email protected]> Signed-off-by: Niladri Halder <[email protected]> Co-authored-by: Eng Zer Jun <[email protected]>
openebs-archive · Feb 9, 2023 · b93fdc3 · b93fdc3
1 parent 2e7f546
commit b93fdc3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/changelogs/unreleased/685-Juneezee b/changelogs/unreleased/685-Juneezee
@@ -0,0 +1 @@
+replace github.com/ghodss/yaml with sigs.k8s.io/yaml
diff --git a/cmd/ndm_daemonset/controller/ndmconfig.go b/cmd/ndm_daemonset/controller/ndmconfig.go
@@ -20,8 +20,8 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/ghodss/yaml"
 	"k8s.io/klog/v2"
+	"sigs.k8s.io/yaml"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/diskfs/go-diskfs v1.1.1
-	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.2.3
 	github.com/golang/protobuf v1.5.2
 	github.com/mitchellh/go-ps v1.0.0
@@ -24,6 +23,7 @@ require (
 	k8s.io/client-go v0.25.4
 	k8s.io/klog/v2 v2.80.1
 	sigs.k8s.io/controller-runtime v0.13.1
+	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
@@ -92,5 +92,4 @@ require (
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -124,7 +124,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

diff --git a/integration_tests/k8s/k8sgen.go b/integration_tests/k8s/k8sgen.go
@@ -17,12 +17,12 @@ limitations under the License.
 package k8s
 
 import (
-	"github.com/ghodss/yaml"
 	"github.com/openebs/node-disk-manager/integration_tests/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apiextensionsV1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"sigs.k8s.io/yaml"
 )
 
 // NDMYaml is a string type that stores the path to the YAML files
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		replace github.com/ghodss/yaml with sigs.k8s.io/yaml