Skip to content

Commit

Permalink
Merge pull request openshift#185 from ingvagabund/k8s-1.13
Browse files Browse the repository at this point in the history
K8s 1.13
  • Loading branch information
openshift-merge-robot committed Mar 28, 2019
2 parents 67d323f + 50732ee commit 38323ca
Show file tree
Hide file tree
Showing 629 changed files with 27,679 additions and 11,357 deletions.
74 changes: 47 additions & 27 deletions Gopkg.lock

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

15 changes: 7 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ required = [

[[override]]
name = "k8s.io/kube-aggregator"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "github.com/openshift/cluster-api"
Expand All @@ -38,28 +38,27 @@ required = [

[[override]]
name = "k8s.io/code-generator"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "k8s.io/api"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.12.5"
version = "kubernetes-1.13.1"

[[override]]
name = "sigs.k8s.io/controller-runtime"
# version = "v0.1.8" # does not work, still pulls v.1.10 instead
revision = "c63ebda0bf4be5f0a8abd4003e4ea546032545ba"
version = "v0.1.10"

[[constraint]]
name="sigs.k8s.io/controller-tools"
Expand Down

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

10 changes: 10 additions & 0 deletions vendor/github.com/appscode/jsonpatch/.travis.yml

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

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

8 changes: 8 additions & 0 deletions vendor/github.com/appscode/jsonpatch/go.mod

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

8 changes: 8 additions & 0 deletions vendor/github.com/appscode/jsonpatch/go.sum

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

Loading

0 comments on commit 38323ca

Please sign in to comment.