From ef4983fb523b4e277313716ff702cb09e995316d Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 Jan 2019 10:45:21 -0500 Subject: [PATCH] Update generated files --- Godeps/Godeps.json | 9 - Godeps/LICENSES | 60 ----- api/openapi-spec/BUILD | 2 +- build/root/BUILD.root | 1 - go.mod | 238 ++++++++++++++++++ pkg/kubectl/apply/parse/BUILD | 2 +- pkg/kubectl/apply/strategy/BUILD | 6 +- pkg/kubectl/cmd/BUILD | 2 +- pkg/kubectl/cmd/apply/BUILD | 2 +- pkg/kubectl/cmd/get/BUILD | 2 +- pkg/kubectl/cmd/util/openapi/BUILD | 2 +- pkg/kubectl/cmd/util/openapi/validation/BUILD | 2 +- .../Godeps/Godeps.json | 12 - .../src/k8s.io/apiserver/Godeps/Godeps.json | 8 - staging/src/k8s.io/apiserver/pkg/server/BUILD | 1 - .../k8s.io/apiserver/pkg/server/routes/BUILD | 10 +- .../k8s.io/kube-aggregator/Godeps/Godeps.json | 12 - .../sample-apiserver/Godeps/Godeps.json | 12 - vendor/BUILD | 2 - 19 files changed, 249 insertions(+), 136 deletions(-) create mode 100644 go.mod diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 443b06241f0..9587640438e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1538,10 +1538,6 @@ "ImportPath": "github.com/docker/spdystream/spdy", "Rev": "449fdfce4d962303d702fec724ef0ad181c92528" }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "3dcc96556217539f50599357fb481ac0dc7439b9" - }, { "ImportPath": "github.com/elazarl/goproxy", "Comment": "v1.0-104-gc4fc26588b6ef8", @@ -1552,11 +1548,6 @@ "Comment": "2.2.0-4-gff4f55a206334e", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, - { - "ImportPath": "github.com/emicklei/go-restful-swagger12", - "Comment": "1.0.1", - "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6" - }, { "ImportPath": "github.com/emicklei/go-restful/log", "Comment": "2.2.0-4-gff4f55a206334e", diff --git a/Godeps/LICENSES b/Godeps/LICENSES index dc57e2adfb2..558b966f0fc 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -45601,37 +45601,6 @@ Apache License ================================================================================ -================================================================================ -= vendor/github.com/elazarl/go-bindata-assetfs licensed under: = - -Copyright (c) 2014, Elazar Leibovich -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -= vendor/github.com/elazarl/go-bindata-assetfs/LICENSE 722abb44e97dc8f098516e09e5564a6a -================================================================================ - - ================================================================================ = vendor/github.com/elazarl/goproxy licensed under: = @@ -45696,35 +45665,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ================================================================================ -================================================================================ -= vendor/github.com/emicklei/go-restful-swagger12 licensed under: = - -Copyright (c) 2017 Ernest Micklei - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -= vendor/github.com/emicklei/go-restful-swagger12/LICENSE b1ce415d97e837c8677d332b274d4f0b -================================================================================ - - ================================================================================ = vendor/github.com/emicklei/go-restful/log licensed under: = diff --git a/api/openapi-spec/BUILD b/api/openapi-spec/BUILD index 47da3709cf4..339d8628221 100644 --- a/api/openapi-spec/BUILD +++ b/api/openapi-spec/BUILD @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name = "swagger-spec", + name = "openapi-spec", srcs = glob([ "**/*.json", ]), diff --git a/build/root/BUILD.root b/build/root/BUILD.root index a5bc4a59102..d4bb831a07d 100644 --- a/build/root/BUILD.root +++ b/build/root/BUILD.root @@ -63,7 +63,6 @@ filegroup( srcs = [ ":package-srcs", "//api/openapi-spec:all-srcs", - "//api/swagger-spec:all-srcs", "//build:all-srcs", "//cluster:all-srcs", "//cmd:all-srcs", diff --git a/go.mod b/go.mod new file mode 100644 index 00000000000..a30b3386452 --- /dev/null +++ b/go.mod @@ -0,0 +1,238 @@ +module k8s.io/kubernetes + +require ( + bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 + bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c + cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2 + github.com/Azure/azure-sdk-for-go v21.3.0+incompatible + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 + github.com/Azure/go-autorest v11.1.0+incompatible + github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da + github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100 + github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab + github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd + github.com/Microsoft/go-winio v0.4.5 + github.com/Microsoft/hcsshim v0.6.11 + github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 + github.com/PuerkitoBio/purell v1.0.0 + github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 + github.com/Rican7/retry v0.0.0-20160712041035-272ad122d6e5 + github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e + github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf + github.com/aws/aws-sdk-go v1.14.12 + github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e + github.com/bazelbuild/buildtools v0.0.0-20171220125010-1a9c38e0df93 + github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 + github.com/blang/semver v3.5.0+incompatible + github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 + github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda + github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf + github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 + github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 + github.com/container-storage-interface/spec v1.0.0 + github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa + github.com/containerd/containerd v1.0.2 + github.com/containernetworking/cni v0.6.0 + github.com/coreos/bbolt v1.3.1-coreos.6 + github.com/coreos/etcd v3.3.10+incompatible + github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416 + github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a + github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 + github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea + github.com/coreos/rkt v1.25.0 + github.com/cpuguy83/go-md2man v1.0.4 + github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299 + github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c + github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266 + github.com/daaku/go.zipexe v0.0.0-20150329023125-a5fe2436ffcb + github.com/davecgh/go-spew v0.0.0-20170626231645-782f4967f2dc + github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd + github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda + github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff + github.com/docker/docker v0.0.0-20180612054059-a9fbbdc8dd87 + github.com/docker/go-connections v0.3.0 + github.com/docker/go-units v0.0.0-20170127094116-9e638d38cf69 + github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789 + github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 + github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e + github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 + github.com/euank/go-kmsg-parser v2.0.0+incompatible + github.com/evanphx/json-patch v0.0.0-20180908160633-36442dbdb585 + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d + github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96 + github.com/fsnotify/fsnotify v0.0.0-20160816051541-f12c6236fe7b + github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 + github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 + github.com/go-ini/ini v1.25.4 + github.com/go-openapi/analysis v0.17.2 + github.com/go-openapi/errors v0.17.2 + github.com/go-openapi/jsonpointer v0.18.0 + github.com/go-openapi/jsonreference v0.18.0 + github.com/go-openapi/loads v0.17.2 + github.com/go-openapi/runtime v0.17.2 + github.com/go-openapi/spec v0.17.2 + github.com/go-openapi/strfmt v0.17.0 + github.com/go-openapi/swag v0.17.2 + github.com/go-openapi/validate v0.18.0 + github.com/go-ozzo/ozzo-validation v3.5.0+incompatible + github.com/go-sql-driver/mysql v1.3.0 + github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 + github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 + github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01 + github.com/golang/protobuf v1.1.0 + github.com/google/btree v0.0.0-20160524151835-7d79101e329e + github.com/google/cadvisor v0.32.0 + github.com/google/certificate-transparency-go v1.0.21 + github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 + github.com/google/uuid v0.0.0-20171113160352-8c31c18f31ed + github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d + github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc + github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c + github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 + github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20180830092908-498ae206fc3c + github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611 + github.com/grpc-ecosystem/grpc-gateway v1.3.0 + github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880 + github.com/hashicorp/hcl v0.0.0-20160711231752-d8c773c4cba1 + github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0 + github.com/imdario/mergo v0.3.5 + github.com/inconshreveable/mousetrap v1.0.0 + github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 + github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 + github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade + github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c + github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be + github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7 + github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22 + github.com/karrick/godirwalk v1.7.5 + github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49 + github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 + github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51 + github.com/kr/text v0.0.0-20130911015532-6807e777504f + github.com/kubernetes/repo-infra v0.0.0-20181105221531-f2459dc75fc4 + github.com/lib/pq v0.0.0-20180201184707-88edab080323 + github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875 + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de + github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4 + github.com/mailru/easyjson v0.0.0-20170624190925-2f5df55504eb + github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c + github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de + github.com/mattn/go-sqlite3 v1.6.0 + github.com/matttproud/golang_protobuf_extensions v1.0.1 + github.com/mesos/mesos-go v0.0.0-20180906210748-ff8175bfda54 + github.com/mholt/caddy v0.0.0-20180213163048-2de495001514 + github.com/miekg/dns v0.0.0-20160614162101-5d001d020961 + github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2 + github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77 + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 + github.com/mitchellh/mapstructure v0.0.0-20170307201123-53818660ed49 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd + github.com/modern-go/reflect2 v1.0.1 + github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb + github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058 + github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a + github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f + github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe + github.com/onsi/gomega v0.0.0-20160911051023-d59fa0ac68bb + github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420 + github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634 + github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1 + github.com/opencontainers/runtime-spec v1.0.0 + github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9 + github.com/pborman/uuid v0.0.0-20150603214016-ca53cad383ca + github.com/pelletier/go-toml v1.2.0 + github.com/peterbourgon/diskv v2.0.1+incompatible + github.com/pkg/errors v0.8.0 + github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6 + github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 + github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 + github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20 + github.com/prometheus/client_golang v0.9.1 + github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 + github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa + github.com/prometheus/procfs v0.0.0-20170519190837-65c1f6f8f0fc + github.com/quobyte/api v0.0.0-20180315135631-206ef832283c + github.com/rancher/go-rancher v0.0.0-20160922212217-09693a8743ba + github.com/renstrom/dedent v0.0.0-20150819195903-020d11c3b9c0 + github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 + github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c + github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5 + github.com/satori/go.uuid v1.2.0 + github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e + github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db + github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d + github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2 + github.com/soheilhy/cmux v0.1.3 + github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97 + github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a + github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937 + github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 + github.com/spf13/pflag v1.0.1 + github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8 + github.com/storageos/go-api v0.0.0-20180126153955-3a4032328d99 + github.com/stretchr/objx v0.0.0-20150928122152-1a9d0bb9f541 + github.com/stretchr/testify v0.0.0-20180319223459-c679ae2cc0cb + github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 + github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 + github.com/ugorji/go v0.0.0-20171019201919-bdcc60b419d1 + github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e + github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 + github.com/vmware/govmomi v0.0.0-20180822160426-22f74650cf39 + github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc + github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57 + github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 + go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 + go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df + go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 + golang.org/x/crypto v0.0.0-20180808211826-de0752318171 + golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 + golang.org/x/net v0.0.0-20180124060956-0ed95abb35c4 + golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181 + golang.org/x/sys v0.0.0-20171031081856-95c657629925 + golang.org/x/text v0.0.0-20170810154203-b19bf474d317 + golang.org/x/time v0.0.0-20161028155119-f51c12702a4d + golang.org/x/tools v0.0.0-20170428054726-2382e3994d48 + gonum.org/v1/gonum v0.0.0-20180726124543-cebdade430cc + google.golang.org/api v0.0.0-20181220000619-583d854617af + google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 + google.golang.org/grpc v1.13.0 + gopkg.in/gcfg.v1 v1.2.0 + gopkg.in/inf.v0 v0.9.0 + gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7 + gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84 + gopkg.in/warnings.v0 v0.1.1 + gopkg.in/yaml.v2 v2.2.1 + k8s.io/gengo v0.0.0-20181106084056-51747d6e00da + k8s.io/heapster v1.2.0-beta.1 + k8s.io/klog v0.0.0-20181108234604-8139d8cb77af + k8s.io/kube-openapi v0.0.0-20181109181836-c59034cc13d5 + k8s.io/utils v0.0.0-20181114164612-8e7ff06bf0e2 + sigs.k8s.io/kustomize v0.0.0-20181123011112-ef51cceff55b + sigs.k8s.io/yaml v1.1.0 + vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc +) + +require ( + k8s.io/api v0.0.0 + k8s.io/apiextensions-apiserver v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/cluster-bootstrap v0.0.0 + k8s.io/code-generator v0.0.0 + k8s.io/csi-api v0.0.0 + k8s.io/kube-aggregator v0.0.0 + k8s.io/kube-controller-manager v0.0.0 + k8s.io/kube-proxy v0.0.0 + k8s.io/kube-scheduler v0.0.0 + k8s.io/kubelet v0.0.0 + k8s.io/metrics v0.0.0 + k8s.io/node-api v0.0.0 + k8s.io/sample-apiserver v0.0.0 + k8s.io/sample-cli-plugin v0.0.0 + k8s.io/sample-controller v0.0.0 +) \ No newline at end of file diff --git a/pkg/kubectl/apply/parse/BUILD b/pkg/kubectl/apply/parse/BUILD index 3114b61db10..cce2e4db37c 100644 --- a/pkg/kubectl/apply/parse/BUILD +++ b/pkg/kubectl/apply/parse/BUILD @@ -27,7 +27,7 @@ go_test( name = "go_default_test", srcs = ["suite_test.go"], data = [ - "//api/openapi-spec:swagger-spec", + "//api/openapi-spec", ], embed = [":go_default_library"], deps = [ diff --git a/pkg/kubectl/apply/strategy/BUILD b/pkg/kubectl/apply/strategy/BUILD index 6243b3a20d0..cbb9370544c 100644 --- a/pkg/kubectl/apply/strategy/BUILD +++ b/pkg/kubectl/apply/strategy/BUILD @@ -31,8 +31,8 @@ go_test( "utils_test.go", ], data = [ - ":swagger-spec", - "//api/openapi-spec:swagger-spec", + ":openapi-spec", + "//api/openapi-spec", ], embed = [":go_default_library"], deps = [ @@ -64,7 +64,7 @@ filegroup( ) filegroup( - name = "swagger-spec", + name = "openapi-spec", srcs = glob([ "**/*.json", ]), diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 3672fe88d02..89ec72bf71f 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -70,7 +70,7 @@ go_test( name = "go_default_test", srcs = ["cmd_test.go"], data = [ - "//api/openapi-spec:swagger-spec", + "//api/openapi-spec", "//pkg/kubectl/cmd/plugin:testdata", "//test/e2e/testing-manifests:all-srcs", "//test/fixtures", diff --git a/pkg/kubectl/cmd/apply/BUILD b/pkg/kubectl/cmd/apply/BUILD index 89f2da19261..70de35dd181 100644 --- a/pkg/kubectl/cmd/apply/BUILD +++ b/pkg/kubectl/cmd/apply/BUILD @@ -50,7 +50,7 @@ go_test( name = "go_default_test", srcs = ["apply_test.go"], data = [ - "//api/openapi-spec:swagger-spec", + "//api/openapi-spec", "//test/fixtures", ], embed = [":go_default_library"], diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 3f15092e541..0aa20de3c04 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -72,7 +72,7 @@ go_test( "sorter_test.go", ], data = [ - "//api/openapi-spec:swagger-spec", + "//api/openapi-spec", "//test/e2e/testing-manifests:all-srcs", "//test/fixtures", ], diff --git a/pkg/kubectl/cmd/util/openapi/BUILD b/pkg/kubectl/cmd/util/openapi/BUILD index 5958bec309a..fe1a6cb01ba 100644 --- a/pkg/kubectl/cmd/util/openapi/BUILD +++ b/pkg/kubectl/cmd/util/openapi/BUILD @@ -35,7 +35,7 @@ go_test( "openapi_suite_test.go", "openapi_test.go", ], - data = ["//api/openapi-spec:swagger-spec"], + data = ["//api/openapi-spec"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/pkg/kubectl/cmd/util/openapi/validation/BUILD b/pkg/kubectl/cmd/util/openapi/validation/BUILD index 4475eaec3a7..2b1d0326a97 100644 --- a/pkg/kubectl/cmd/util/openapi/validation/BUILD +++ b/pkg/kubectl/cmd/util/openapi/validation/BUILD @@ -26,7 +26,7 @@ go_test( "validation_suite_test.go", "validation_test.go", ], - data = ["//api/openapi-spec:swagger-spec"], + data = ["//api/openapi-spec"], embed = [":go_default_library"], deps = [ "//pkg/kubectl/cmd/util/openapi:go_default_library", diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 2071af6e52d..1be06bd1f7b 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -366,18 +366,10 @@ "ImportPath": "github.com/docker/docker/pkg/term/windows", "Rev": "a9fbbdc8dd8794b20af358382ab780559bca589d" }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "3dcc96556217539f50599357fb481ac0dc7439b9" - }, { "ImportPath": "github.com/emicklei/go-restful", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, - { - "ImportPath": "github.com/emicklei/go-restful-swagger12", - "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6" - }, { "ImportPath": "github.com/emicklei/go-restful/log", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" @@ -1562,10 +1554,6 @@ "ImportPath": "k8s.io/apiserver/pkg/server/routes", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/server/routes/data/swagger", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/server/storage", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 58f2eb568fe..fa37b2f7a5c 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -366,18 +366,10 @@ "ImportPath": "github.com/docker/docker/pkg/term/windows", "Rev": "a9fbbdc8dd8794b20af358382ab780559bca589d" }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "3dcc96556217539f50599357fb481ac0dc7439b9" - }, { "ImportPath": "github.com/emicklei/go-restful", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, - { - "ImportPath": "github.com/emicklei/go-restful-swagger12", - "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6" - }, { "ImportPath": "github.com/emicklei/go-restful/log", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" diff --git a/staging/src/k8s.io/apiserver/pkg/server/BUILD b/staging/src/k8s.io/apiserver/pkg/server/BUILD index 68588c5a83c..94c5c867a21 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/BUILD @@ -109,7 +109,6 @@ go_library( "//staging/src/k8s.io/client-go/util/cert:go_default_library", "//vendor/github.com/coreos/go-systemd/daemon:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", - "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/pborman/uuid:go_default_library", "//vendor/golang.org/x/net/http2:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/BUILD b/staging/src/k8s.io/apiserver/pkg/server/routes/BUILD index 0b81332a3a4..62511517fa1 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/routes/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/BUILD @@ -14,8 +14,6 @@ go_library( "metrics.go", "openapi.go", "profiling.go", - "swagger.go", - "swaggerui.go", "version.go", ], importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server/routes", @@ -27,11 +25,8 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/metrics:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/mux:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics:go_default_library", - "//vendor/github.com/elazarl/go-bindata-assetfs:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", - "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library", @@ -48,9 +43,6 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 50fc94dd618..555dd09fbf2 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -90,18 +90,10 @@ "ImportPath": "github.com/docker/spdystream/spdy", "Rev": "449fdfce4d962303d702fec724ef0ad181c92528" }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "3dcc96556217539f50599357fb481ac0dc7439b9" - }, { "ImportPath": "github.com/emicklei/go-restful", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, - { - "ImportPath": "github.com/emicklei/go-restful-swagger12", - "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6" - }, { "ImportPath": "github.com/emicklei/go-restful/log", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" @@ -1162,10 +1154,6 @@ "ImportPath": "k8s.io/apiserver/pkg/server/routes", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/server/routes/data/swagger", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/server/storage", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 14944a3b8da..30a0785e156 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -82,18 +82,10 @@ "ImportPath": "github.com/docker/docker/pkg/term/windows", "Rev": "a9fbbdc8dd8794b20af358382ab780559bca589d" }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "3dcc96556217539f50599357fb481ac0dc7439b9" - }, { "ImportPath": "github.com/emicklei/go-restful", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, - { - "ImportPath": "github.com/emicklei/go-restful-swagger12", - "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6" - }, { "ImportPath": "github.com/emicklei/go-restful/log", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" @@ -1126,10 +1118,6 @@ "ImportPath": "k8s.io/apiserver/pkg/server/routes", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/server/routes/data/swagger", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/server/storage", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/vendor/BUILD b/vendor/BUILD index b06fe8509dd..7d2a9a5cfd8 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -185,10 +185,8 @@ filegroup( "//vendor/github.com/docker/go-units:all-srcs", "//vendor/github.com/docker/libnetwork/ipvs:all-srcs", "//vendor/github.com/docker/spdystream:all-srcs", - "//vendor/github.com/elazarl/go-bindata-assetfs:all-srcs", "//vendor/github.com/elazarl/goproxy:all-srcs", "//vendor/github.com/emicklei/go-restful:all-srcs", - "//vendor/github.com/emicklei/go-restful-swagger12:all-srcs", "//vendor/github.com/euank/go-kmsg-parser/kmsgparser:all-srcs", "//vendor/github.com/evanphx/json-patch:all-srcs", "//vendor/github.com/exponent-io/jsonpath:all-srcs",