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

Updating to k8s 1.11. #344

Merged
merged 9 commits into from
Aug 14, 2018
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
  •  
  •  
  •  
115 changes: 71 additions & 44 deletions Gopkg.lock

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

32 changes: 25 additions & 7 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

required = [
"k8s.io/apimachinery/pkg/util/sets/types",
"k8s.io/apimachinery/pkg/apimachinery/registered",
"k8s.io/code-generator/cmd/deepcopy-gen",
"k8s.io/code-generator/cmd/defaulter-gen",
"k8s.io/code-generator/cmd/client-gen",
Expand Down Expand Up @@ -36,19 +35,25 @@ required = [

[[override]]
name = "k8s.io/api"
version = "kubernetes-1.10.1"
version = "kubernetes-1.11.0"

[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.10.1"
version = "kubernetes-1.11.0"

[[override]]
name = "k8s.io/code-generator"
version = "kubernetes-1.10.1"
version = "kubernetes-1.11.0"

[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.10.1"
version = "kubernetes-1.11.0"

[[override]]
name = "github.com/json-iterator/go"
# This is the commit at which k8s depends on this in 1.11
# It seems to be broken at HEAD.
revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"

[[override]]
name = "github.com/golang/protobuf"
Expand All @@ -64,8 +69,13 @@ required = [

[[constraint]]
name = "github.com/knative/pkg"
# HEAD as of 2018-08-03
revision = "a088fee6227f7c6842ce7f7406cb75af8a6e0643"
# HEAD as of 2018-08-09
revision = "bc264c290f777cc51f53644a1996f5e8887dcba6"

[[constraint]]
name = "github.com/knative/serving"
# HEAD as of 2018-08-13
revision = "ace9afa467f6b1b0e6fb343bac87ff612afd6700"

[[override]]
name = "github.com/Shopify/sarama"
Expand All @@ -75,3 +85,11 @@ required = [
[[constraint]]
name = "github.com/bsm/sarama-cluster"
version = "2.1.13"

[[constraint]]
name = "sigs.k8s.io/controller-runtime"
# TODO when https://github.com/kubernetes-sigs/controller-runtime/pull/108 lands,
# re-point back at sigs.k8s.io/controller-runtime fork
source = "github.com/n3wscott/controller-runtime"
# HEAD as of 2018-08-13
revision = "21388f002e2c9d66214326bcd3486f0e1b5f4857"
2 changes: 0 additions & 2 deletions pkg/client/clientset/versioned/clientset.go

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

Loading