Merge pull request #10718 from rohitsardesai83/release-3.3

etcd: Replace ghodss/yaml with sigs.k8s.io/yaml in 3.3
etcd-io · May 29, 2019 · b0babe5 · b0babe5
2 parents 98d3084 + 8ed3e70
commit b0babe5
Show file tree

Hide file tree

Showing 44 changed files with 3,767 additions and 321 deletions.
diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -98,15 +98,6 @@
 			}
 		]
 	},
-	{
-		"project": "github.com/ghodss/yaml",
-		"licenses": [
-			{
-				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License",
-				"confidence": 1
-			}
-		]
-	},
 	{
 		"project": "github.com/gogo/protobuf",
 		"licenses": [
@@ -465,5 +456,14 @@
 				"confidence": 0.8975609756097561
 			}
 		]
+	},
+	{
+		"project": "sigs.k8s.io/yaml",
+		"licenses": [
+			{
+				"type": "BSD 3-clause \"New\" or \"Revised\" License",
+				"confidence": 1
+			}
+		]
 	}
 ]
diff --git a/bill-of-materials.override.json b/bill-of-materials.override.json
@@ -8,10 +8,10 @@
 		]
 	},
 	{
-		"project": "github.com/ghodss/yaml",
+		"project": "sigs.k8s.io/yaml",
 		"licenses": [
 			{
-				"type": "MIT License and BSD 3-clause \"New\" or \"Revised\" License"
+				"type": "BSD 3-clause \"New\" or \"Revised\" License"
 			}
 		]
 	},

diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go
@@ -20,7 +20,7 @@ import (
 	"crypto/x509"
 	"io/ioutil"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/tlsutil"

diff --git a/clientv3/yaml/config_test.go b/clientv3/yaml/config_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 var (

diff --git a/cmd/vendor/gopkg.in/yaml.v2/.travis.yml b/cmd/vendor/gopkg.in/yaml.v2/.travis.yml
diff --git a/cmd/vendor/gopkg.in/yaml.v2/LICENSE b/cmd/vendor/gopkg.in/yaml.v2/LICENSE
diff --git a/cmd/vendor/gopkg.in/yaml.v2/NOTICE b/cmd/vendor/gopkg.in/yaml.v2/NOTICE