Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vendor #96

Merged
merged 3 commits into from
Dec 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
572 changes: 490 additions & 82 deletions Gopkg.lock

Large diffs are not rendered by default.

49 changes: 23 additions & 26 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,54 +1,51 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"

# `dep` does not seem to like this empty directory in the Kubernetes
# repository.
ignored = ["k8s.io/kubernetes/pkg/api"]

[[constraint]]
name = "github.com/golang/glog"
revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"

[[constraint]]
name = "github.com/gorilla/websocket"
version = "v1.2.0"

[[constraint]]
name = "github.com/prometheus/client_golang"
version = "v0.8.0"

[[constraint]]
name = "github.com/spf13/pflag"
version = "v1.0.0"

[[constraint]]
name = "google.golang.org/api"
revision = "654f863362977d69086620b5f72f13e911da2410"

[[constraint]]
name = "k8s.io/api"
revision = "409c3b2393cd3359f275bd8b883b4d9c5aec41f6"
# We are currently vendoring a non-released k8s version. This should go away
# once the symbol has been released.
revision = "02509811a0e5c1e5bb0656e31ec861da05cd801c"

[[constraint]]
name = "k8s.io/apimachinery"
revision = "e9a29eff7d472df0f7da9ead5ab59b74e74a07ec"
revision = "kubernetes-1.9.0"

[[constraint]]
name = "k8s.io/client-go"
revision = "076e344c86e52f088b78615f815b245f6d613537"
revision = "kubernetes-1.9.0"

[[constraint]]
name = "k8s.io/kubernetes"
revision = "88975e98d6f4a84929a243abeb772de16399a4e9"
revision = "99d3e21eb54cc5869679927e7783b8810f6edc50"

[[constraint]]
name = "github.com/docker/distribution"
# Kubernetes is currently vendoring a non-released version. One of the
# symbols needed is not longer there in the released tag.
revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"

[[constraint]]
name = "github.com/opencontainers/go-digest"
version = "1.0.0-rc1"
7 changes: 2 additions & 5 deletions examples/https/make_secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ import (
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

// This installs the legacy v1 API
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/legacyscheme"
)

// TODO:
Expand Down Expand Up @@ -74,5 +71,5 @@ func main() {
if err != nil {
log.Fatalf("%v", err)
}
fmt.Printf(runtime.EncodeOrDie(api.Codecs.LegacyCodec(arm.EnabledVersions()...), secret))
fmt.Printf(runtime.EncodeOrDie(legacyscheme.Codecs.LegacyCodec(arm.EnabledVersions()...), secret))
}
3 changes: 1 addition & 2 deletions pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/kubernetes/pkg/api"

"k8s.io/ingress-gce/pkg/annotations"
"k8s.io/ingress-gce/pkg/context"
Expand Down Expand Up @@ -100,7 +99,7 @@ func newIngress(hostRules map[string]utils.FakeIngressRuleValueMap) *extensions.
return &extensions.Ingress{
ObjectMeta: meta_v1.ObjectMeta{
Name: fmt.Sprintf("%v", uuid.NewUUID()),
Namespace: api.NamespaceNone,
Namespace: "",
},
Spec: extensions.IngressSpec{
Backend: &extensions.IngressBackend{
Expand Down
20 changes: 15 additions & 5 deletions vendor/cloud.google.com/go/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 43 additions & 17 deletions vendor/cloud.google.com/go/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/cloud.google.com/go/CONTRIBUTORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions vendor/cloud.google.com/go/MIGRATION.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading