diff --git a/Gopkg.lock b/Gopkg.lock index f7e0bbbd..94f3d134 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -32,14 +32,6 @@ revision = "3b1641ed03046f2ee28d73f7a51e5b884d55b92a" version = "v11.7.0" -[[projects]] - digest = "1:464aef731a5f82ded547c62e249a2e9ec59fbbc9ddab53cda7b9857852630a61" - name = "github.com/appscode/jsonpatch" - packages = ["."] - pruneopts = "T" - revision = "7c0e3b262f30165a8ec3d0b4c6059fd92703bfb2" - version = "1.0.0" - [[projects]] branch = "master" digest = "1:ad4589ec239820ee99eb01c1ad47ebc5f8e02c4f5103a9b210adff9696d89f36" @@ -186,14 +178,6 @@ revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" version = "v1.3.1" -[[projects]] - branch = "master" - digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df" - name = "github.com/google/btree" - packages = ["."] - pruneopts = "T" - revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" - [[projects]] branch = "master" digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" @@ -238,17 +222,6 @@ pruneopts = "T" revision = "0719c6b22f30132b0ae6c90b038e0d50992107b0" -[[projects]] - branch = "master" - digest = "1:4607fd19c69c3deee61840fca759fedb3908e4fcb09385e2f3783b93e0035c73" - name = "github.com/gregjones/httpcache" - packages = [ - ".", - "diskcache", - ] - pruneopts = "T" - revision = "9cad4c3443a7200dd6400aef47183728de563a38" - [[projects]] digest = "1:d26054aef028b782f9b65c29f17b8b6a5c75e302b6656f370b9c0788b1e35a00" name = "github.com/grpc-ecosystem/grpc-gateway" @@ -433,22 +406,6 @@ revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1" version = "v1.2" -[[projects]] - branch = "master" - digest = "1:0c29d499ffc3b9f33e7136444575527d0c3a9463a89b3cbeda0523b737f910b3" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - pruneopts = "T" - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" - -[[projects]] - digest = "1:598241bd36d3a5f6d9102a306bd9bf78f3bc253672460d92ac70566157eae648" - name = "github.com/peterbourgon/diskv" - packages = ["."] - pruneopts = "T" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" - [[projects]] digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" @@ -711,6 +668,14 @@ pruneopts = "T" revision = "6adeb8aab2ded9eb693b831d5fd090c10a6ebdfa" +[[projects]] + digest = "1:7c65747ea6380bd254afcf806cc06be1d1a9de73ee7ce6e896127f54e1ee10fe" + name = "gomodules.xyz/jsonpatch" + packages = ["v2"] + pruneopts = "T" + revision = "e8422f09d27ee2c8cfb2c7f8089eb9eeb0764849" + version = "v2.0.0" + [[projects]] digest = "1:ad9a4a8828809a8dfd3d51eb5d05af11f9ec853beb7370e0d1312379ef973af3" name = "google.golang.org/api" @@ -824,11 +789,10 @@ version = "v2.2.1" [[projects]] - digest = "1:a8dd0f5c1137ed558bca1fed6617b019aa645783731d15138abc6f184952fef5" + digest = "1:bbd4fd8b2a8a552b0c8ac509c3993c83c22897804bb262ae176e6bd202ab9f6b" name = "k8s.io/api" packages = [ "admission/v1beta1", - "admissionregistration/v1alpha1", "admissionregistration/v1beta1", "apps/v1", "apps/v1beta1", @@ -845,15 +809,20 @@ "batch/v1beta1", "batch/v2alpha1", "certificates/v1beta1", + "coordination/v1", "coordination/v1beta1", "core/v1", "events/v1beta1", "extensions/v1beta1", "networking/v1", + "networking/v1beta1", + "node/v1alpha1", + "node/v1beta1", "policy/v1beta1", "rbac/v1", "rbac/v1alpha1", "rbac/v1beta1", + "scheduling/v1", "scheduling/v1alpha1", "scheduling/v1beta1", "settings/v1alpha1", @@ -862,11 +831,11 @@ "storage/v1beta1", ] pruneopts = "T" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" - version = "kubernetes-1.13.1" + revision = "539a33f6e81741ed7bc3f69e07b4a966788723cf" + version = "kubernetes-1.14.4" [[projects]] - digest = "1:d6b5f1f23ca1b4a68aacbe3167fdd56babaf4b0a72b5d0c166595cee4b71532d" + digest = "1:bbfaf1b9636fe8a4a58f6e005137b209ab246199ecd434a78e330c00e32b87a8" name = "k8s.io/apiextensions-apiserver" packages = [ "pkg/apis/apiextensions", @@ -876,11 +845,11 @@ "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", ] pruneopts = "T" - revision = "0fe22c71c47604641d9aa352c785b7912c200562" - version = "kubernetes-1.13.1" + revision = "527eacf2d4b757e37a6ac23d2b866e5607441998" + version = "kubernetes-1.14.4" [[projects]] - digest = "1:6326c0acd4934569b53d305d4a79a30f7074b3d4fdb3537af06203b68297a22b" + digest = "1:e0ec21060953ced38018fae667796890cd67dac80f969eec1634ff5ecfcf59a8" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", @@ -928,18 +897,17 @@ "third_party/forked/golang/reflect", ] pruneopts = "T" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" - version = "kubernetes-1.13.1" + revision = "6a84e37a896db9780c75367af8d2ed2bb944022e" + version = "kubernetes-1.14.4" [[projects]] - digest = "1:0b3ba6818a03b0f0f181ab6b88d9be03789d02ede8929d876f45210471811fdb" + digest = "1:cc1ba75c11e8127212c347bf215e0bac83bd999a1429281e2325ce053b798aa4" name = "k8s.io/client-go" packages = [ "discovery", "dynamic", "informers", "informers/admissionregistration", - "informers/admissionregistration/v1alpha1", "informers/admissionregistration/v1beta1", "informers/apps", "informers/apps/v1", @@ -958,6 +926,7 @@ "informers/certificates", "informers/certificates/v1beta1", "informers/coordination", + "informers/coordination/v1", "informers/coordination/v1beta1", "informers/core", "informers/core/v1", @@ -968,6 +937,10 @@ "informers/internalinterfaces", "informers/networking", "informers/networking/v1", + "informers/networking/v1beta1", + "informers/node", + "informers/node/v1alpha1", + "informers/node/v1beta1", "informers/policy", "informers/policy/v1beta1", "informers/rbac", @@ -975,6 +948,7 @@ "informers/rbac/v1alpha1", "informers/rbac/v1beta1", "informers/scheduling", + "informers/scheduling/v1", "informers/scheduling/v1alpha1", "informers/scheduling/v1beta1", "informers/settings", @@ -985,7 +959,6 @@ "informers/storage/v1beta1", "kubernetes", "kubernetes/scheme", - "kubernetes/typed/admissionregistration/v1alpha1", "kubernetes/typed/admissionregistration/v1beta1", "kubernetes/typed/apps/v1", "kubernetes/typed/apps/v1beta1", @@ -1002,22 +975,26 @@ "kubernetes/typed/batch/v1beta1", "kubernetes/typed/batch/v2alpha1", "kubernetes/typed/certificates/v1beta1", + "kubernetes/typed/coordination/v1", "kubernetes/typed/coordination/v1beta1", "kubernetes/typed/core/v1", "kubernetes/typed/events/v1beta1", "kubernetes/typed/extensions/v1beta1", "kubernetes/typed/networking/v1", + "kubernetes/typed/networking/v1beta1", + "kubernetes/typed/node/v1alpha1", + "kubernetes/typed/node/v1beta1", "kubernetes/typed/policy/v1beta1", "kubernetes/typed/rbac/v1", "kubernetes/typed/rbac/v1alpha1", "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/scheduling/v1", "kubernetes/typed/scheduling/v1alpha1", "kubernetes/typed/scheduling/v1beta1", "kubernetes/typed/settings/v1alpha1", "kubernetes/typed/storage/v1", "kubernetes/typed/storage/v1alpha1", "kubernetes/typed/storage/v1beta1", - "listers/admissionregistration/v1alpha1", "listers/admissionregistration/v1beta1", "listers/apps/v1", "listers/apps/v1beta1", @@ -1030,15 +1007,20 @@ "listers/batch/v1beta1", "listers/batch/v2alpha1", "listers/certificates/v1beta1", + "listers/coordination/v1", "listers/coordination/v1beta1", "listers/core/v1", "listers/events/v1beta1", "listers/extensions/v1beta1", "listers/networking/v1", + "listers/networking/v1beta1", + "listers/node/v1alpha1", + "listers/node/v1beta1", "listers/policy/v1beta1", "listers/rbac/v1", "listers/rbac/v1alpha1", "listers/rbac/v1beta1", + "listers/scheduling/v1", "listers/scheduling/v1alpha1", "listers/scheduling/v1beta1", "listers/settings/v1alpha1", @@ -1070,24 +1052,24 @@ "tools/metrics", "tools/pager", "tools/record", + "tools/record/util", "tools/reference", "transport", - "util/buffer", "util/cert", "util/connrotation", "util/flowcontrol", "util/homedir", - "util/integer", "util/jsonpath", + "util/keyutil", "util/retry", "util/workqueue", ] pruneopts = "T" - revision = "8d9ed539ba3134352c586810e749e58df4e94e4f" - version = "kubernetes-1.13.1" + revision = "62e1c231c5dca3a31a42634c83cc17910a3b6a48" + version = "kubernetes-1.14.4" [[projects]] - digest = "1:dc1ae99dcab96913d81ae970b1f7a7411a54199b14bfb17a7e86f9a56979c720" + digest = "1:2d821667dbd520a7ef31bdc923543f197ba30021b4317fd8871618ada52f23b0" name = "k8s.io/code-generator" packages = [ "cmd/client-gen", @@ -1100,11 +1082,12 @@ "cmd/client-gen/types", "cmd/deepcopy-gen", "cmd/deepcopy-gen/args", + "pkg/namer", "pkg/util", ] pruneopts = "T" - revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae" - version = "kubernetes-1.13.1" + revision = "50b561225d70b3eb79a1faafd3dfe7b1a62cbe73" + version = "kubernetes-1.14.4" [[projects]] digest = "1:2b9071c93303f1196cfe959c7f7f69ed1e4a5180f240a259536c5886f79f86d4" @@ -1130,7 +1113,7 @@ version = "v0.2.0" [[projects]] - digest = "1:07ccbbf6fac978e39fa6a7212ffe6d6098a8a940d008ab41b0908402df3d1dcb" + digest = "1:445e92ad4cc5847fb2aa3009fa1a33864a9bfc3a481bfeb94ea572ad06de054d" name = "k8s.io/kube-aggregator" packages = [ "pkg/apis/apiregistration", @@ -1140,8 +1123,8 @@ "pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1", ] pruneopts = "T" - revision = "1e8cd453c47488cff773c5ebcd70ca0b0ce054d9" - version = "kubernetes-1.13.1" + revision = "5c6c51a77ba763eb33fdd7f252c41ed9e8a337f3" + version = "kubernetes-1.14.4" [[projects]] branch = "master" @@ -1152,8 +1135,19 @@ revision = "e494cc58111187acad93e64529228a2fc0153e39" [[projects]] - branch = "list-gvk" - digest = "1:231427b56abbad4c90e239eb75af10b7b28fe29a70650272b46f5246baf57faa" + branch = "master" + digest = "1:97a96f0b5790e4de4e83651c162c7c093c610043626ef5a5d0f00211ebef6be2" + name = "k8s.io/utils" + packages = [ + "buffer", + "integer", + "trace", + ] + pruneopts = "T" + revision = "3dccf664f023863740c508fb4284e49742bedfa4" + +[[projects]] + digest = "1:e04d03de743245cb462e5378fee8c7ffd4e7f08aa7871d6fe78d33f19351cebc" name = "sigs.k8s.io/controller-runtime" packages = [ "pkg/cache", @@ -1187,11 +1181,12 @@ "pkg/source/internal", "pkg/webhook", "pkg/webhook/admission", + "pkg/webhook/internal/certwatcher", "pkg/webhook/internal/metrics", ] pruneopts = "T" - revision = "7f16f2b744937bb10e5a3acca56aa5b54f534813" - source = "github.com/pusher/controller-runtime" + revision = "aaddbd9d9a89d8ff329a084aece23be0406e6467" + version = "v0.2.0-beta.4" [[projects]] digest = "1:2aec1bbf1553a2d433b3a85f9359930655de83e2dceed4aca44577a720396da8" diff --git a/Gopkg.toml b/Gopkg.toml index 729e14b4..a0475d27 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -35,27 +35,27 @@ version="v1.3.0" # Overridefor kubernetes dependencies to pin them to a particular version [[override]] name="k8s.io/api" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/apiextensions-apiserver" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/apimachinery" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/client-go" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/kube-aggregator" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/code-generator" -version="kubernetes-1.13.1" +version="kubernetes-1.14.4" [[override]] name="k8s.io/gengo" @@ -63,8 +63,7 @@ revision="0689ccc1d7d65d9dd1bedcc3b0b1ed7df91ba266" [[override]] name="sigs.k8s.io/controller-runtime" -source="github.com/pusher/controller-runtime" -branch="list-gvk" +version="v0.2.0-beta.4" [[override]] name="sigs.k8s.io/controller-tools" diff --git a/Makefile.tools b/Makefile.tools index f01a3899..5b0c783b 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -36,30 +36,37 @@ kustomize: go get -u sigs.k8s.io/kustomize; \ fi +.PHONY: kubebuilder-tools-1.14 +kubebuilder-tools-1.14: + @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+(-(alpha|beta)\.[0-9+])?"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ + if [ "$$ver" != "2.0.0-beta.0" ]; then \ + kubebuilder_version=2.0.0-beta.0 kubernetes_version=1.14 make install-kubebuilder-tools; \ + fi + .PHONY: kubebuilder-tools-1.13 kubebuilder-tools-1.13: - @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ + @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+(-(alpha|beta)\.[0-9+])?"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ if [ "$$ver" != "1.0.8" ]; then \ kubebuilder_version=1.0.8 kubernetes_version=1.13 make install-kubebuilder-tools; \ fi .PHONY: kubebuilder-tools-1.12 kubebuilder-tools-1.12: - @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ + @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[[0-9]\.[0-9]+\.[0-9]+(-(alpha|beta)\.[0-9+])?"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ if [ "$$ver" != "1.0.7" ]; then \ kubebuilder_version=1.0.7 kubernetes_version=1.12 make install-kubebuilder-tools; \ fi .PHONY: kubebuilder-tools-1.11 kubebuilder-tools-1.11: - @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ + @ ver=$$(kubebuilder version | awk '{where = match($$0, /KubeBuilderVersion:"[0-9]\.[0-9]+\.[0-9]+(-(alpha|beta)\.[0-9+])?"/); if (where != 0) print substr($$0, RSTART+20, RLENGTH)}' | sed s/\",.\*// ); \ if [ "$$ver" != "1.0.5" ]; then \ kubebuilder_version=1.0.5 kubernetes_version=1.11 make install-kubebuilder-tools; \ fi # latest stable version -kubebuilder_version ?= 1.0.8 -kubernetes_version ?= 1.13 +kubebuilder_version ?= 2.0.0-beta.0 +kubernetes_version ?= 1.14 os := $(shell uname | awk '{print tolower($$0)}') # Version string should be approx v1.x.x_linux_amd64 kubebuilder_version_string=$(kubebuilder_version)_$(os)_amd64