From 9343eb9911e1c589f0b97104a3e428ee710134bd Mon Sep 17 00:00:00 2001
From: Sanket Sudake <sanketsudake@gmail.com>
Date: Fri, 5 Aug 2022 16:09:34 +0530
Subject: [PATCH] Use sig.k8s.io/yaml instead of ghodss/yaml (#2506)

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
---
 go.mod                                            | 1 -
 go.sum                                            | 1 -
 pkg/featureconfig/config.go                       | 2 +-
 pkg/fission-cli/cmd/spec/init.go                  | 2 +-
 pkg/fission-cli/cmd/spec/spec.go                  | 2 +-
 pkg/fission-cli/cmd/support/resources/resource.go | 2 +-
 pkg/fission-cli/cmd/version/version.go            | 2 +-
 pkg/generator/encoder/encoder.go                  | 2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 0f80e7a4..1ba8208e 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/emicklei/go-restful-openapi v1.4.1
 	github.com/fatih/color v1.13.0
 	github.com/fsnotify/fsnotify v1.5.1
-	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-openapi/spec v0.20.4
 	github.com/golang-jwt/jwt/v4 v4.3.0
diff --git a/go.sum b/go.sum
index 04367c3f..00f28066 100644
--- a/go.sum
+++ b/go.sum
@@ -248,7 +248,6 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
diff --git a/pkg/featureconfig/config.go b/pkg/featureconfig/config.go
index c0b2d8e6..e653522f 100644
--- a/pkg/featureconfig/config.go
+++ b/pkg/featureconfig/config.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 // GetFeatureConfig reads the configMap file and unmarshals the config into a feature config struct
diff --git a/pkg/fission-cli/cmd/spec/init.go b/pkg/fission-cli/cmd/spec/init.go
index dfc30ee5..d28c7ae3 100644
--- a/pkg/fission-cli/cmd/spec/init.go
+++ b/pkg/fission-cli/cmd/spec/init.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
+	"sigs.k8s.io/yaml"
 
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
 	"github.com/fission/fission/pkg/fission-cli/cmd"
diff --git a/pkg/fission-cli/cmd/spec/spec.go b/pkg/fission-cli/cmd/spec/spec.go
index 12619b66..c19d2116 100644
--- a/pkg/fission-cli/cmd/spec/spec.go
+++ b/pkg/fission-cli/cmd/spec/spec.go
@@ -23,11 +23,11 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 
 	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
diff --git a/pkg/fission-cli/cmd/support/resources/resource.go b/pkg/fission-cli/cmd/support/resources/resource.go
index 285edc29..621f94c9 100644
--- a/pkg/fission-cli/cmd/support/resources/resource.go
+++ b/pkg/fission-cli/cmd/support/resources/resource.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 
 	"github.com/fission/fission/pkg/fission-cli/console"
 	"github.com/fission/fission/pkg/utils"
diff --git a/pkg/fission-cli/cmd/version/version.go b/pkg/fission-cli/cmd/version/version.go
index 9f363698..39d472da 100644
--- a/pkg/fission-cli/cmd/version/version.go
+++ b/pkg/fission-cli/cmd/version/version.go
@@ -19,8 +19,8 @@ package version
 import (
 	"fmt"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
 	"github.com/fission/fission/pkg/fission-cli/cmd"
diff --git a/pkg/generator/encoder/encoder.go b/pkg/generator/encoder/encoder.go
index be4bf924..1b8dd877 100644
--- a/pkg/generator/encoder/encoder.go
+++ b/pkg/generator/encoder/encoder.go
@@ -19,7 +19,7 @@ package encoder
 import (
 	"encoding/json"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 type (