diff --git a/glide.lock b/glide.lock index efefa3de1..f5ab29b12 100644 --- a/glide.lock +++ b/glide.lock @@ -1,21 +1,14 @@ -hash: f705b8873fe2e7fb0cf436e2485edf218f558ae726015e6d59490d53464ae536 -updated: 2017-05-17T12:47:01.838888143-06:00 +hash: adaaaf3d7bb416de3dff4c34bfee192661fa32dd1b53bd48dc583fe4949dcac3 +updated: 2017-07-03T14:35:27.116781224-07:00 imports: -- name: bitbucket.org/ww/goautoneg - version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 - subpackages: - - compute/metadata - - internal - name: github.com/aokoli/goutils version: 9c37978a95bd5c709a15883b6242714ea6709e64 - name: github.com/asaskevich/govalidator version: 7664702784775e51966f0885f5cd27435916517b -- name: github.com/Azure/go-ansiterm - version: 70b2c90b260171e829f1ebd7c17f600c11858dbe - subpackages: - - winterm +- name: github.com/Azure/go-autorest + version: d7c034a8af24eda120dd6460bfcd6d9ed14e43ca - name: github.com/beorn7/perks version: 3ac7bf7a47d159a033b107610db8a1b6575507a4 subpackages: @@ -24,20 +17,6 @@ imports: version: b26d9c308763d68093482582cea63d69be07a0f0 - name: github.com/chai2010/gettext-go version: bf70f2a70fb1b1f36d90d671a72795984eab0fcb -- name: github.com/coreos/go-oidc - version: be73733bb8cc830d0205609b95d125215f8e9c70 - subpackages: - - http - - jose - - key - - oauth2 - - oidc -- name: github.com/coreos/pkg - version: fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8 - subpackages: - - health - - httputil - - timeutil - name: github.com/cpuguy83/go-md2man version: a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa subpackages: @@ -53,18 +32,6 @@ imports: subpackages: - digest - reference -- name: github.com/docker/docker - version: b9f10c951893f9a00865890a5232e85d770c1087 - subpackages: - - pkg/jsonlog - - pkg/jsonmessage - - pkg/longpath - - pkg/mount - - pkg/stdcopy - - pkg/symlink - - pkg/system - - pkg/term - - pkg/term/windows - name: github.com/docker/engine-api version: dea108d3aa0c67d7162a3fd8aa65f38a430019fd subpackages: @@ -91,13 +58,12 @@ imports: version: e30f1e79f3cd72542f2026ceec18d3bd67ab859c - name: github.com/docker/spdystream version: 449fdfce4d962303d702fec724ef0ad181c92528 - subpackages: - - spdy - name: github.com/emicklei/go-restful - version: 09691a3b6378b740595c1002f40c34dd5f218a22 + version: ff4f55a206334ef123e4f79bbf348980da81ca46 subpackages: - log - - swagger +- name: github.com/emicklei/go-restful-swagger12 + version: dcef7f55730566d41eae5db10e7d6981829720f6 - name: github.com/evanphx/json-patch version: ba18e35c5c1b36ef6334cad706eb681153d2d379 - name: github.com/exponent-io/jsonpath @@ -106,14 +72,24 @@ imports: version: 2de1f203e7d5e386a6833233882782932729f27e - name: github.com/facebookgo/symwalk version: 42004b9f322246749dd73ad71008b1f3160c0052 +- name: github.com/fatih/camelcase + version: f6a740d52f961c60348ebb109adde9f4635d7540 - name: github.com/ghodss/yaml version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee +- name: github.com/go-openapi/analysis + version: b44dc874b601d9e4e2f6e19140e794ba24bead3b +- name: github.com/go-openapi/errors + version: d24ebc2075bad502fac3a8ae27aa6dd58e1952dc - name: github.com/go-openapi/jsonpointer version: 46af16f9f7b149af66e5d1bd010e3574dc06de98 - name: github.com/go-openapi/jsonreference version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272 +- name: github.com/go-openapi/loads + version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 - name: github.com/go-openapi/spec version: 6aced65f8501fe1217321abf0749d354824ba2ff +- name: github.com/go-openapi/strfmt + version: 93a31ef21ac23f317792fff78f9539219dd74619 - name: github.com/go-openapi/swag version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72 - name: github.com/gobwas/glob @@ -129,8 +105,31 @@ imports: - name: github.com/gogo/protobuf version: c0656edd0d9eab7c66d1eb0c568f9039345796f7 subpackages: + - gogoproto + - plugin/compare + - plugin/defaultcheck + - plugin/description + - plugin/embedcheck + - plugin/enumstringer + - plugin/equal + - plugin/face + - plugin/gostring + - plugin/marshalto + - plugin/oneofcheck + - plugin/populate + - plugin/size + - plugin/stringer + - plugin/testgen + - plugin/union + - plugin/unmarshal - proto + - protoc-gen-gogo/descriptor + - protoc-gen-gogo/generator + - protoc-gen-gogo/grpc + - protoc-gen-gogo/plugin - sortkeys + - vanity + - vanity/command - name: github.com/golang/glog version: 44145f04b68cf362d9c4df2182967c2275eaefed - name: github.com/golang/groupcache @@ -152,6 +151,8 @@ imports: - util/wordwrap - name: github.com/grpc-ecosystem/go-grpc-prometheus version: 34abd90a014618f61222a1b0a7b7eb834a2d0dc3 +- name: github.com/hashicorp/golang-lru + version: 0a025b7e63adc15a622f29b0b2c4c3848243bbf6 - name: github.com/howeyc/gopass version: 3ca23474a7c7203e0a0a070fd33508f6efdb9b3d - name: github.com/huandu/xstrings @@ -160,10 +161,8 @@ imports: version: 6633656539c1639d9d78127b7d47c622b5d7b6dc - name: github.com/inconshreveable/mousetrap version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/jonboulle/clockwork - version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982 - name: github.com/juju/ratelimit - version: 77ed1c8a01217656d2080ad51981f6e99adaa177 + version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 - name: github.com/mailru/easyjson version: d5b7844b561a7bc640052f1b935f7b800330d7e0 subpackages: @@ -182,8 +181,8 @@ imports: version: fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a subpackages: - pbutil -- name: github.com/mitchellh/go-wordwrap - version: ad45545899c7b13c020ea92b2072220eefad42b8 +- name: github.com/mitchellh/mapstructure + version: d0303fe809921458f417bcf828397a65db30a7e4 - name: github.com/naoina/go-stringutil version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b - name: github.com/pborman/uuid @@ -198,12 +197,15 @@ imports: subpackages: - go - name: github.com/prometheus/common - version: ffe929a3f4c4faeaa10f2b9535c2b1be3ad15650 + version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207 subpackages: - expfmt + - internal/bitbucket.org/ww/goautoneg - model - name: github.com/prometheus/procfs - version: 454a56f35412459b5e684fd5ec0f9211b94f002a + version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259 + subpackages: + - xfs - name: github.com/PuerkitoBio/purell version: 8a290539e2e8629dbc4e6bad948158f790ec31f4 - name: github.com/PuerkitoBio/urlesc @@ -214,8 +216,6 @@ imports: version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/shurcooL/sanitized_anchor_name version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 -- name: github.com/Sirupsen/logrus - version: 51fe59aca108dc5680109e7b2051cbdcfa5a253c - name: github.com/spf13/cobra version: f62e98d28ab7ad31d707ba837a966378465c7b57 subpackages: @@ -228,6 +228,7 @@ imports: version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 subpackages: - codec + - codec/codecgen - name: golang.org/x/crypto version: d172538b2cfce0c13cee31e647d0367aa8cd2486 subpackages: @@ -243,24 +244,17 @@ imports: - scrypt - ssh/terminal - name: golang.org/x/net - version: e90d6d0afc4c315a0d87a568ae68577cc15149a0 + version: f2499483f923065a842d38eb4c7f1927e6fc6e6d subpackages: - context - - context/ctxhttp - http2 - http2/hpack - idna - internal/timeseries - lex/httplex - trace - - websocket - name: golang.org/x/oauth2 version: 3c3a985cb79f52a3190fbc056984415ca6763d01 - subpackages: - - google - - internal - - jws - - jwt - name: golang.org/x/sys version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 subpackages: @@ -283,18 +277,6 @@ imports: - unicode/bidi - unicode/norm - width -- name: google.golang.org/appengine - version: 4f7eeb5305a4ba1966344836ba4af9996b7b4e05 - subpackages: - - internal - - internal/app_identity - - internal/base - - internal/datastore - - internal/log - - internal/modules - - internal/remote_api - - internal/urlfetch - - urlfetch - name: google.golang.org/grpc version: 8050b9cbc271307e5a716a9d782803d09b0d6f2d subpackages: @@ -311,170 +293,30 @@ imports: - transport - name: gopkg.in/inf.v0 version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 +- name: gopkg.in/mgo.v2 + version: 3f83fa5005286a7fe593b055f0d7771a7dce4655 + subpackages: + - bson - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 -- name: k8s.io/apimachinery - version: fbd6803372f831e58b86c78d07421637a64ad768 - subpackages: - - pkg/api/equality - - pkg/api/errors - - pkg/api/meta - - pkg/api/resource - - pkg/api/validation - - pkg/apimachinery - - pkg/apimachinery/announced - - pkg/apimachinery/registered - - pkg/apis/meta/v1 - - pkg/apis/meta/v1/unstructured - - pkg/apis/meta/v1/validation - - pkg/conversion - - pkg/conversion/queryparams - - pkg/fields - - pkg/labels - - pkg/openapi - - pkg/runtime - - pkg/runtime/schema - - pkg/runtime/serializer - - pkg/runtime/serializer/json - - pkg/runtime/serializer/protobuf - - pkg/runtime/serializer/recognizer - - pkg/runtime/serializer/streaming - - pkg/runtime/serializer/versioning - - pkg/selection - - pkg/types - - pkg/util/diff - - pkg/util/errors - - pkg/util/framer - - pkg/util/httpstream - - pkg/util/httpstream/spdy - - pkg/util/intstr - - pkg/util/json - - pkg/util/mergepatch - - pkg/util/net - - pkg/util/rand - - pkg/util/runtime - - pkg/util/sets - - pkg/util/strategicpatch - - pkg/util/uuid - - pkg/util/validation - - pkg/util/validation/field - - pkg/util/wait - - pkg/util/yaml - - pkg/version - - pkg/watch - - third_party/forked/golang/json - - third_party/forked/golang/netutil - - third_party/forked/golang/reflect - name: k8s.io/apiserver version: 2308857ad3b8b18abf74ff734853973eda9da94d subpackages: + - pkg/admission + - pkg/apis/apiserver + - pkg/apis/apiserver/install + - pkg/apis/apiserver/v1alpha1 - pkg/authentication/authenticator - pkg/authentication/serviceaccount - pkg/authentication/user + - pkg/endpoints/request - pkg/features - - pkg/server/httplog - pkg/util/feature - pkg/util/flag - - pkg/util/wsstream -- name: k8s.io/client-go - version: 5b0e11b577b35539f05523c47e94ed96a17f992b - subpackages: - - discovery - - discovery/fake - - dynamic - - kubernetes - - kubernetes/scheme - - kubernetes/typed/apps/v1beta1 - - kubernetes/typed/authentication/v1 - - kubernetes/typed/authentication/v1beta1 - - kubernetes/typed/authorization/v1 - - kubernetes/typed/authorization/v1beta1 - - kubernetes/typed/autoscaling/v1 - - kubernetes/typed/autoscaling/v2alpha1 - - kubernetes/typed/batch/v1 - - kubernetes/typed/batch/v2alpha1 - - kubernetes/typed/certificates/v1beta1 - - kubernetes/typed/core/v1 - - kubernetes/typed/extensions/v1beta1 - - kubernetes/typed/policy/v1beta1 - - kubernetes/typed/rbac/v1alpha1 - - kubernetes/typed/rbac/v1beta1 - - kubernetes/typed/settings/v1alpha1 - - kubernetes/typed/storage/v1 - - kubernetes/typed/storage/v1beta1 - - pkg/api - - pkg/api/helper - - pkg/api/install - - pkg/api/v1 - - pkg/apis/apps - - pkg/apis/apps/install - - pkg/apis/apps/v1beta1 - - pkg/apis/authentication - - pkg/apis/authentication/install - - pkg/apis/authentication/v1 - - pkg/apis/authentication/v1beta1 - - pkg/apis/authorization - - pkg/apis/authorization/install - - pkg/apis/authorization/v1 - - pkg/apis/authorization/v1beta1 - - pkg/apis/autoscaling - - pkg/apis/autoscaling/install - - pkg/apis/autoscaling/v1 - - pkg/apis/autoscaling/v2alpha1 - - pkg/apis/batch - - pkg/apis/batch/install - - pkg/apis/batch/v1 - - pkg/apis/batch/v2alpha1 - - pkg/apis/certificates - - pkg/apis/certificates/install - - pkg/apis/certificates/v1beta1 - - pkg/apis/extensions - - pkg/apis/extensions/install - - pkg/apis/extensions/v1beta1 - - pkg/apis/policy - - pkg/apis/policy/install - - pkg/apis/policy/v1beta1 - - pkg/apis/rbac - - pkg/apis/rbac/install - - pkg/apis/rbac/v1alpha1 - - pkg/apis/rbac/v1beta1 - - pkg/apis/settings - - pkg/apis/settings/install - - pkg/apis/settings/v1alpha1 - - pkg/apis/storage - - pkg/apis/storage/install - - pkg/apis/storage/v1 - - pkg/apis/storage/v1beta1 - - pkg/util - - pkg/util/parsers - - pkg/version - - plugin/pkg/client/auth - - plugin/pkg/client/auth/gcp - - plugin/pkg/client/auth/oidc - - rest - - rest/fake - - rest/watch - - testing - - third_party/forked/golang/template - - tools/auth - - tools/cache - - tools/clientcmd - - tools/clientcmd/api - - tools/clientcmd/api/latest - - tools/clientcmd/api/v1 - - tools/metrics - - tools/portforward - - tools/record - - transport - - util/cert - - util/clock - - util/flowcontrol - - util/homedir - - util/integer - - util/jsonpath - name: k8s.io/kubernetes - version: 0480917b552be33e2dba47386e51decb1a211df6 + version: d3ada0119e776222f11ec7945e6d860061339aad subpackages: + - cmd/kubeadm/app/apis/kubeadm - federation/apis/federation - federation/apis/federation/install - federation/apis/federation/v1beta1 @@ -486,15 +328,28 @@ imports: - federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion - federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion - pkg/api - - pkg/api/annotations - pkg/api/events + - pkg/api/helper + - pkg/api/helper/qos - pkg/api/install - pkg/api/pod + - pkg/api/ref + - pkg/api/resource - pkg/api/service - pkg/api/testapi - pkg/api/util - pkg/api/v1 + - pkg/api/v1/helper + - pkg/api/v1/helper/qos + - pkg/api/v1/pod + - pkg/api/v1/ref - pkg/api/validation + - pkg/apis/admission + - pkg/apis/admission/install + - pkg/apis/admission/v1alpha1 + - pkg/apis/admissionregistration + - pkg/apis/admissionregistration/install + - pkg/apis/admissionregistration/v1alpha1 - pkg/apis/apps - pkg/apis/apps/install - pkg/apis/apps/v1beta1 @@ -526,6 +381,9 @@ imports: - pkg/apis/imagepolicy - pkg/apis/imagepolicy/install - pkg/apis/imagepolicy/v1alpha1 + - pkg/apis/networking + - pkg/apis/networking/install + - pkg/apis/networking/v1 - pkg/apis/policy - pkg/apis/policy/install - pkg/apis/policy/v1beta1 @@ -544,6 +402,7 @@ imports: - pkg/capabilities - pkg/client/clientset_generated/clientset - pkg/client/clientset_generated/clientset/scheme + - pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1 - pkg/client/clientset_generated/clientset/typed/apps/v1beta1 - pkg/client/clientset_generated/clientset/typed/authentication/v1 - pkg/client/clientset_generated/clientset/typed/authentication/v1beta1 @@ -556,6 +415,7 @@ imports: - pkg/client/clientset_generated/clientset/typed/certificates/v1beta1 - pkg/client/clientset_generated/clientset/typed/core/v1 - pkg/client/clientset_generated/clientset/typed/extensions/v1beta1 + - pkg/client/clientset_generated/clientset/typed/networking/v1 - pkg/client/clientset_generated/clientset/typed/policy/v1beta1 - pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1 - pkg/client/clientset_generated/clientset/typed/rbac/v1beta1 @@ -565,6 +425,8 @@ imports: - pkg/client/clientset_generated/internalclientset - pkg/client/clientset_generated/internalclientset/fake - pkg/client/clientset_generated/internalclientset/scheme + - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion + - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion @@ -581,6 +443,8 @@ imports: - pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake + - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion + - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion @@ -589,12 +453,19 @@ imports: - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake + - pkg/client/informers/informers_generated/externalversions/apps/v1beta1 + - pkg/client/informers/informers_generated/externalversions/core/v1 + - pkg/client/informers/informers_generated/externalversions/extensions/v1beta1 + - pkg/client/informers/informers_generated/externalversions/internalinterfaces + - pkg/client/leaderelection/resourcelock + - pkg/client/listers/apps/v1beta1 - pkg/client/listers/core/v1 - pkg/client/listers/extensions/v1beta1 - pkg/client/retry - pkg/client/unversioned - - pkg/client/unversioned/remotecommand - pkg/controller + - pkg/controller/daemon + - pkg/controller/daemon/util - pkg/controller/deployment/util - pkg/credentialprovider - pkg/features @@ -602,27 +473,46 @@ imports: - pkg/kubectl - pkg/kubectl/cmd/testing - pkg/kubectl/cmd/util + - pkg/kubectl/cmd/util/openapi + - pkg/kubectl/plugins - pkg/kubectl/resource + - pkg/kubectl/util + - pkg/kubelet/apis - pkg/kubelet/qos - - pkg/kubelet/server/remotecommand - pkg/kubelet/types - pkg/master/ports - pkg/printers - pkg/printers/internalversion + - pkg/registry/rbac/validation - pkg/security/apparmor - pkg/serviceaccount - pkg/util - pkg/util/exec - pkg/util/hash - - pkg/util/interrupt - pkg/util/labels + - pkg/util/metrics + - pkg/util/mount - pkg/util/net/sets - pkg/util/node - pkg/util/parsers - pkg/util/slice - - pkg/util/term - pkg/version + - pkg/volume/util - pkg/watch/json + - plugin/pkg/scheduler/algorithm + - plugin/pkg/scheduler/algorithm/predicates + - plugin/pkg/scheduler/algorithm/priorities/util + - plugin/pkg/scheduler/api + - plugin/pkg/scheduler/schedulercache + - plugin/pkg/scheduler/util +- name: k8s.io/metrics + version: fd2415bb9381a6731027b48a8c6b78f28e13f876 + subpackages: + - pkg/apis/metrics + - pkg/apis/metrics/v1alpha1 + - pkg/client/clientset_generated/clientset + - pkg/client/clientset_generated/clientset/scheme + - pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1 - name: vbom.ml/util version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 repo: https://github.com/fvbommel/util.git diff --git a/glide.yaml b/glide.yaml index 7b298a29e..0e36cc660 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,7 +1,6 @@ package: k8s.io/helm import: - package: golang.org/x/net - version: e90d6d0afc4c315a0d87a568ae68577cc15149a0 subpackages: - context - package: github.com/spf13/cobra @@ -28,10 +27,8 @@ import: - ptypes/timestamp - package: google.golang.org/grpc version: 1.2.1 -- package: k8s.io/apimachinery -- package: k8s.io/client-go - package: k8s.io/kubernetes - version: ~1.6.0 + version: ~1.7.0 - package: github.com/gosuri/uitable - package: github.com/asaskevich/govalidator version: ^4.0.0 @@ -49,12 +46,42 @@ import: version: ~0.1.0 - package: github.com/chai2010/gettext-go - package: github.com/prometheus/client_golang - version: v0.8.0 + version: 0.8.0 - package: vbom.ml/util repo: https://github.com/fvbommel/util.git vcs: git - package: github.com/docker/distribution - version: ~v2.4.0 + version: ~2.4.0 + +# hacks for kubernetes v1.7 +- package: cloud.google.com/go +- package: github.com/Azure/go-autorest + version: d7c034a8af24eda120dd6460bfcd6d9ed14e43ca +- package: github.com/dgrijalva/jwt-go +- package: github.com/docker/spdystream +- package: github.com/go-openapi/analysis + version: b44dc874b601d9e4e2f6e19140e794ba24bead3b +- package: github.com/go-openapi/errors + version: d24ebc2075bad502fac3a8ae27aa6dd58e1952dc +- package: github.com/go-openapi/loads + version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 +- package: github.com/go-openapi/spec + version: 6aced65f8501fe1217321abf0749d354824ba2ff +- package: github.com/google/gofuzz +- package: github.com/hashicorp/golang-lru +- package: github.com/howeyc/gopass +- package: github.com/juju/ratelimit + version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 +- package: github.com/pborman/uuid +- package: golang.org/x/oauth2 +- package: gopkg.in/inf.v0 +- package: github.com/go-openapi/strfmt +- package: github.com/mitchellh/mapstructure +- package: gopkg.in/mgo.v2/bson +ignore: + - k8s.io/client-go + - k8s.io/apimachinery + testImports: - package: github.com/stretchr/testify version: ^1.1.4 diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 190b03ca0..c0a9a42bb 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -39,6 +39,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/helper" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" batchinternal "k8s.io/kubernetes/pkg/apis/batch" @@ -106,7 +107,7 @@ func (c *Client) newBuilder(namespace string, reader io.Reader) *resource.Result if err != nil { c.Log("warning: failed to load schema: %s", err) } - return c.NewBuilder(). + return c.NewBuilder(true). ContinueOnError(). Schema(schema). NamespaceParam(namespace). @@ -123,14 +124,12 @@ func (c *Client) BuildUnstructured(namespace string, reader io.Reader) (Result, c.Log("warning: failed to load schema: %s", err) } - mapper, typer, err := c.UnstructuredObject() + var result Result + b, err := c.NewUnstructuredBuilder(true) if err != nil { - c.Log("failed to load mapper: %s", err) - return nil, err + return result, err } - var result Result - result, err = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(c.UnstructuredClientForMapping), unstructured.UnstructuredJSONScheme). - ContinueOnError(). + result, err = b.ContinueOnError(). Schema(schema). NamespaceParam(namespace). DefaultNamespace(). @@ -376,7 +375,7 @@ func createPatch(mapping *meta.RESTMapping, target, current runtime.Object) ([]b return nil, types.StrategicMergePatchType, fmt.Errorf("serializing target configuration: %s", err) } - if api.Semantic.DeepEqual(oldData, newData) { + if helper.Semantic.DeepEqual(oldData, newData) { return nil, types.StrategicMergePatchType, nil } diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 647a50652..889a12f72 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -174,7 +174,7 @@ func TestUpdate(t *testing.T) { t.Fatalf("could not dump request: %s", err) } req.Body.Close() - expected := `{"spec":{"containers":[{"name":"app:v4","ports":[{"containerPort":443,"name":"https"},{"$patch":"delete","containerPort":80}]}]}}` + expected := `{"spec":{"$setElementOrder/containers":[{"name":"app:v4"}],"containers":[{"$setElementOrder/ports":[{"containerPort":443}],"name":"app:v4","ports":[{"containerPort":443,"name":"https"},{"$patch":"delete","containerPort":80}]}]}}` if string(data) != expected { t.Errorf("expected patch\n%s\ngot\n%s", expected, string(data)) } diff --git a/pkg/kube/tunnel.go b/pkg/kube/tunnel.go index 156fab755..9c8f31e60 100644 --- a/pkg/kube/tunnel.go +++ b/pkg/kube/tunnel.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/portforward" - "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" + "k8s.io/client-go/tools/remotecommand" ) // Tunnel describes a ssh-like tunnel to a kubernetes pod diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index d917d79ed..30173167e 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -25,6 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/api/v1/helper" + podutil "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -128,7 +130,7 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error { func podsReady(pods []v1.Pod) bool { for _, pod := range pods { - if !v1.IsPodReady(&pod) { + if !podutil.IsPodReady(&pod) { return false } } @@ -143,7 +145,7 @@ func servicesReady(svc []v1.Service) bool { } // Make sure the service is not explicitly set to "None" before checking the IP - if s.Spec.ClusterIP != v1.ClusterIPNone && !v1.IsServiceIPSet(&s) { + if s.Spec.ClusterIP != v1.ClusterIPNone && !helper.IsServiceIPSet(&s) { return false } // This checks if the service has a LoadBalancer and that balancer has an Ingress defined diff --git a/scripts/setup-apimachinery.sh b/scripts/setup-apimachinery.sh index c749edcdd..679859f30 100755 --- a/scripts/setup-apimachinery.sh +++ b/scripts/setup-apimachinery.sh @@ -19,7 +19,6 @@ # versioned. set -euo pipefail +rm -rf ./vendor/k8s.io/{kube-aggregator,apiserver,apimachinery,client-go,metrics} -rm -rf ./vendor/k8s.io/{kube-aggregator,apiserver,apimachinery,client-go} - -cp -r ./vendor/k8s.io/kubernetes/staging/src/k8s.io/{kube-aggregator,apiserver,apimachinery,client-go} ./vendor/k8s.io +cp -r ./vendor/k8s.io/kubernetes/staging/src/k8s.io/{kube-aggregator,apiserver,apimachinery,client-go,metrics} ./vendor/k8s.io