Merge pull request #1226 from gravitational/dmitri/kyaml

Update to apimachinery release-1.7.
gravitational · Aug 28, 2017 · c3f58c6 · c3f58c6
2 parents 08a7b49 + 696be65
commit c3f58c6
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 21 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/lib/services/saml_test.go b/lib/services/saml_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/gravitational/teleport/lib/utils"
 
 	"gopkg.in/check.v1"
-	kyaml "k8s.io/client-go/1.4/pkg/util/yaml"
+	kyaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
 type SAMLSuite struct{}

diff --git a/lib/web/apiserver_test.go b/lib/web/apiserver_test.go
@@ -69,7 +69,7 @@ import (
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/websocket"
 	. "gopkg.in/check.v1"
-	kyaml "k8s.io/client-go/1.4/pkg/util/yaml"
+	kyaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
 func TestWeb(t *testing.T) {

diff --git a/tool/tctl/common/tctl.go b/tool/tctl/common/tctl.go
@@ -47,7 +47,7 @@ import (
 	"github.com/gravitational/trace"
 	"github.com/jonboulle/clockwork"
 	"golang.org/x/crypto/ssh"
-	kyaml "k8s.io/client-go/1.4/pkg/util/yaml"
+	kyaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
 type CLIConfig struct {

diff --git a/vendor/k8s.io/client-go/LICENSE → vendor/k8s.io/apimachinery/LICENSE b/vendor/k8s.io/client-go/LICENSE → vendor/k8s.io/apimachinery/LICENSE
diff --git a/...io/client-go/1.4/pkg/util/yaml/decoder.go → ....io/apimachinery/pkg/util/yaml/decoder.go b/...io/client-go/1.4/pkg/util/yaml/decoder.go → ....io/apimachinery/pkg/util/yaml/decoder.go