diff --git a/.golangci.json b/.golangci.json index f317e3171c4b..958feef079c4 100644 --- a/.golangci.json +++ b/.golangci.json @@ -11,6 +11,9 @@ ] }, "run": { + "skip-dirs": [ + "(^|/)pkg/generated($|/)" + ], "skip-files": [ "/zz_generated_" ], diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 1feb56b70b20..8814d89184a4 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM golang:1.13.11-alpine3.10 +FROM golang:1.14.4-alpine3.12 ARG http_proxy=$http_proxy ARG https_proxy=$https_proxy @@ -8,7 +8,7 @@ ENV https_proxy=$https_proxy ENV no_proxy=$no_proxy RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \ - python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static + python2 openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static zlib-static RUN apk -U --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/main/ add sqlite-dev sqlite-static libselinux libselinux-dev RUN mkdir -p /go/src/golang.org/x && \ @@ -21,7 +21,7 @@ ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN if [ "${ARCH}" = 'amd64' ]; then \ - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \ + curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.27.0; \ fi ARG SELINUX=true diff --git a/Dockerfile.manifest b/Dockerfile.manifest index dd211f2f6a8b..b7c166ffb241 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -FROM golang:1.13.8-alpine3.10 +FROM golang:1.14.4-alpine3.12 COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index e9ba1b92862d..64ee7fc6f6c3 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,4 +1,4 @@ -FROM golang:1.13.8-alpine3.10 +FROM golang:1.14.4-alpine3.12 RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python2 openssl diff --git a/go.mod b/go.mod index 99b6a7100a9e..ce0e0ef26528 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/k3s -go 1.13 +go 1.14 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7-0.20190926181021-82c7525d98c8 diff --git a/pkg/agent/loadbalancer/loadbalancer_test.go b/pkg/agent/loadbalancer/loadbalancer_test.go index 4e57f9a0bb6d..2a9b1f35600c 100644 --- a/pkg/agent/loadbalancer/loadbalancer_test.go +++ b/pkg/agent/loadbalancer/loadbalancer_test.go @@ -2,7 +2,6 @@ package loadbalancer import ( "bufio" - "context" "errors" "fmt" "io/ioutil" @@ -106,7 +105,7 @@ func TestFailOver(t *testing.T) { DataDir: tmpDir, } - lb, err := New(context.Background(), cfg.DataDir, SupervisorServiceName, cfg.ServerURL) + lb, err := New(cfg.DataDir, SupervisorServiceName, cfg.ServerURL) if err != nil { assertEqual(t, err, nil) } @@ -157,7 +156,7 @@ func TestFailFast(t *testing.T) { DataDir: tmpDir, } - lb, err := New(context.Background(), cfg.DataDir, SupervisorServiceName, cfg.ServerURL) + lb, err := New(cfg.DataDir, SupervisorServiceName, cfg.ServerURL) if err != nil { assertEqual(t, err, nil) } diff --git a/pkg/server/server.go b/pkg/server/server.go index 1da457ce2dad..ac9708d423f4 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -95,7 +95,7 @@ func startWrangler(ctx context.Context, config *Config) error { return case <-config.ControlConfig.Runtime.APIServerReady: if err := runControllers(ctx, config); err != nil { - logrus.Fatal("failed to start controllers: %v", err) + logrus.Fatalf("failed to start controllers: %v", err) } } }() @@ -419,7 +419,7 @@ func setMasterRoleLabel(ctx context.Context, nodes v1.NodeClient) error { node.Labels[MasterRoleLabelKey] = "true" _, err = nodes.Update(node) if err == nil { - logrus.Infof("master role label has been set succesfully on node: %s", nodeName) + logrus.Infof("master role label has been set successfully on node: %s", nodeName) break } select { diff --git a/vendor/modules.txt b/vendor/modules.txt index bfb080760165..1ace662d9bf0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -66,8 +66,10 @@ github.com/Microsoft/hcsshim/internal/timeout github.com/Microsoft/hcsshim/internal/vmcompute github.com/Microsoft/hcsshim/internal/wclayer # github.com/NYTimes/gziphandler v1.1.1 +## explicit github.com/NYTimes/gziphandler # github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 +## explicit github.com/Nvveen/Gotty # github.com/PuerkitoBio/purell v1.1.1 github.com/PuerkitoBio/purell @@ -126,14 +128,17 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 github.com/beorn7/perks/quantile # github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e +## explicit github.com/bhendo/go-powershell github.com/bhendo/go-powershell/backend github.com/bhendo/go-powershell/utils # github.com/blang/semver v3.5.0+incompatible github.com/blang/semver # github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40 +## explicit github.com/bronze1man/goStrongswanVici # github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 +## explicit github.com/buger/jsonparser # github.com/canonical/go-dqlite v1.5.1 github.com/canonical/go-dqlite @@ -157,10 +162,12 @@ github.com/cilium/ebpf/internal/unix # github.com/container-storage-interface/spec v1.2.0 github.com/container-storage-interface/spec/lib/go/csi # github.com/containerd/cgroups v0.0.0-00010101000000-000000000000 => github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 +## explicit github.com/containerd/cgroups # github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1 => github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 github.com/containerd/console # github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69 => github.com/rancher/containerd v1.3.3-k3s2 +## explicit github.com/containerd/containerd github.com/containerd/containerd/api/events github.com/containerd/containerd/api/services/containers/v1 @@ -289,6 +296,7 @@ github.com/containerd/containerd/sys github.com/containerd/containerd/sys/reaper github.com/containerd/containerd/version # github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 => github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02 +## explicit github.com/containerd/continuity github.com/containerd/continuity/devices github.com/containerd/continuity/driver @@ -298,6 +306,7 @@ github.com/containerd/continuity/proto github.com/containerd/continuity/syscallx github.com/containerd/continuity/sysx # github.com/containerd/cri v0.0.0-00010101000000-000000000000 => github.com/rancher/cri v1.3.0-k3s.6 +## explicit github.com/containerd/cri github.com/containerd/cri/pkg/annotations github.com/containerd/cri/pkg/api/runtimeoptions/v1 @@ -320,12 +329,16 @@ github.com/containerd/cri/pkg/store/sandbox github.com/containerd/cri/pkg/store/snapshot github.com/containerd/cri/pkg/util # github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c +## explicit github.com/containerd/fifo # github.com/containerd/go-cni v0.0.0-20190904155053-d20b7eebc7ee +## explicit github.com/containerd/go-cni # github.com/containerd/go-runc v0.0.0-20190923131748-a2952bc25f51 => github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda +## explicit github.com/containerd/go-runc # github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8 +## explicit github.com/containerd/ttrpc # github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 => github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd github.com/containerd/typeurl @@ -337,8 +350,10 @@ github.com/containernetworking/cni/pkg/types/020 github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v0.8.2 +## explicit github.com/containernetworking/plugins/pkg/ns # github.com/coreos/flannel v0.11.0 => github.com/rancher/flannel v0.11.0-k3s.2 +## explicit github.com/coreos/flannel/backend github.com/coreos/flannel/backend/extension github.com/coreos/flannel/backend/hostgw @@ -349,12 +364,14 @@ github.com/coreos/flannel/pkg/ip github.com/coreos/flannel/subnet github.com/coreos/flannel/subnet/kube # github.com/coreos/go-iptables v0.4.2 +## explicit github.com/coreos/go-iptables/iptables # github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-oidc # github.com/coreos/go-semver v0.3.0 github.com/coreos/go-semver/semver # github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +## explicit github.com/coreos/go-systemd/activation github.com/coreos/go-systemd/daemon github.com/coreos/go-systemd/dbus @@ -376,6 +393,7 @@ github.com/docker/distribution/digestset github.com/docker/distribution/reference github.com/docker/distribution/registry/api/errcode # github.com/docker/docker v1.4.2-0.20191205034852-d163fbba3c82 => github.com/docker/docker v17.12.0-ce-rc1.0.20190219214528-cbe11bdc6da8+incompatible +## explicit github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/blkiodev @@ -414,6 +432,7 @@ github.com/docker/go-connections/tlsconfig # github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c github.com/docker/go-events # github.com/docker/go-metrics v0.0.1 +## explicit github.com/docker/go-metrics # github.com/docker/go-units v0.4.0 github.com/docker/go-units @@ -438,6 +457,7 @@ github.com/fsnotify/fsnotify # github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml # github.com/go-bindata/go-bindata v3.1.2+incompatible +## explicit github.com/go-bindata/go-bindata github.com/go-bindata/go-bindata/go-bindata # github.com/go-openapi/analysis v0.19.5 @@ -462,12 +482,14 @@ github.com/go-openapi/swag # github.com/go-openapi/validate v0.19.5 github.com/go-openapi/validate # github.com/go-sql-driver/mysql v1.4.1 +## explicit github.com/go-sql-driver/mysql # github.com/go-stack/stack v1.8.0 github.com/go-stack/stack # github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f github.com/godbus/dbus # github.com/gogo/googleapis v1.3.0 +## explicit github.com/gogo/googleapis/google/rpc # github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf/gogoproto @@ -540,8 +562,10 @@ github.com/google/go-cmp/cmp/internal/value # github.com/google/gofuzz v1.1.0 github.com/google/gofuzz # github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 +## explicit github.com/google/tcpproxy # github.com/google/uuid v1.1.1 +## explicit github.com/google/uuid # github.com/googleapis/gnostic v0.3.1 github.com/googleapis/gnostic/OpenAPIv2 @@ -580,8 +604,10 @@ github.com/gophercloud/gophercloud/openstack/networking/v2/ports github.com/gophercloud/gophercloud/openstack/utils github.com/gophercloud/gophercloud/pagination # github.com/gorilla/mux v1.7.3 +## explicit github.com/gorilla/mux # github.com/gorilla/websocket v1.4.1 +## explicit github.com/gorilla/websocket # github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/gregjones/httpcache @@ -608,15 +634,20 @@ github.com/jonboulle/clockwork # github.com/json-iterator/go v1.1.8 github.com/json-iterator/go # github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d +## explicit github.com/juju/errors +# github.com/juju/testing v0.0.0-20190723135506-ce30eb24acd2 +## explicit # github.com/karrick/godirwalk v1.7.5 github.com/karrick/godirwalk # github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences # github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 => github.com/rancher/cri-tools v1.18.0-k3s1 +## explicit github.com/kubernetes-sigs/cri-tools/cmd/crictl github.com/kubernetes-sigs/cri-tools/pkg/version # github.com/lib/pq v1.1.1 +## explicit github.com/lib/pq github.com/lib/pq/oid github.com/lib/pq/scram @@ -631,6 +662,7 @@ github.com/mailru/easyjson/jwriter # github.com/mattn/go-shellwords v1.0.5 github.com/mattn/go-shellwords # github.com/mattn/go-sqlite3 v1.13.0 +## explicit github.com/mattn/go-sqlite3 # github.com/matttproud/golang_protobuf_extensions v1.0.1 github.com/matttproud/golang_protobuf_extensions/pbutil @@ -655,6 +687,7 @@ github.com/munnerz/goautoneg # github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f github.com/mxk/go-flowrate/flowrate # github.com/natefinch/lumberjack v2.0.0+incompatible +## explicit github.com/natefinch/lumberjack # github.com/opencontainers/go-digest v1.0.0-rc1 github.com/opencontainers/go-digest @@ -663,6 +696,7 @@ github.com/opencontainers/image-spec/identity github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 # github.com/opencontainers/runc v1.0.0-rc10 +## explicit github.com/opencontainers/runc github.com/opencontainers/runc/contrib/cmd/recvtty github.com/opencontainers/runc/libcontainer @@ -692,11 +726,13 @@ github.com/opencontainers/runc/types # github.com/opencontainers/runtime-spec v1.0.0 => github.com/opencontainers/runtime-spec v0.0.0-20180911193056-5684b8af48c1 github.com/opencontainers/runtime-spec/specs-go # github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52 +## explicit github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label # github.com/peterbourgon/diskv v2.0.1+incompatible github.com/peterbourgon/diskv # github.com/pkg/errors v0.9.1 +## explicit github.com/pkg/errors # github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 github.com/pquerna/cachecontrol @@ -718,9 +754,11 @@ github.com/prometheus/procfs/internal/util github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs # github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 +## explicit github.com/rakelkar/gonetsh/netroute github.com/rakelkar/gonetsh/netsh # github.com/rancher/dynamiclistener v0.2.0 +## explicit github.com/rancher/dynamiclistener github.com/rancher/dynamiclistener/cert github.com/rancher/dynamiclistener/factory @@ -728,6 +766,7 @@ github.com/rancher/dynamiclistener/storage/file github.com/rancher/dynamiclistener/storage/kubernetes github.com/rancher/dynamiclistener/storage/memory # github.com/rancher/helm-controller v0.6.2 +## explicit github.com/rancher/helm-controller/pkg/apis/helm.cattle.io github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/generated/clientset/versioned @@ -742,6 +781,7 @@ github.com/rancher/helm-controller/pkg/generated/informers/externalversions/inte github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/helm # github.com/rancher/kine v0.4.0 +## explicit github.com/rancher/kine/pkg/broadcaster github.com/rancher/kine/pkg/client github.com/rancher/kine/pkg/drivers/dqlite @@ -755,8 +795,10 @@ github.com/rancher/kine/pkg/logstructured/sqllog github.com/rancher/kine/pkg/server github.com/rancher/kine/pkg/tls # github.com/rancher/remotedialer v0.2.0 +## explicit github.com/rancher/remotedialer # github.com/rancher/wrangler v0.6.1 +## explicit github.com/rancher/wrangler/pkg/apply github.com/rancher/wrangler/pkg/apply/injectors github.com/rancher/wrangler/pkg/cleanup @@ -785,6 +827,7 @@ github.com/rancher/wrangler/pkg/signals github.com/rancher/wrangler/pkg/slice github.com/rancher/wrangler/pkg/start # github.com/rancher/wrangler-api v0.6.0 +## explicit github.com/rancher/wrangler-api/pkg/generated/controllers/apps github.com/rancher/wrangler-api/pkg/generated/controllers/apps/v1 github.com/rancher/wrangler-api/pkg/generated/controllers/batch @@ -796,6 +839,7 @@ github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1 # github.com/robfig/cron v1.1.0 github.com/robfig/cron # github.com/rootless-containers/rootlesskit v0.7.2 +## explicit github.com/rootless-containers/rootlesskit/pkg/api/client github.com/rootless-containers/rootlesskit/pkg/api/router github.com/rootless-containers/rootlesskit/pkg/child @@ -832,6 +876,7 @@ github.com/seccomp/libseccomp-golang # github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/shurcooL/sanitized_anchor_name # github.com/sirupsen/logrus v1.4.2 +## explicit github.com/sirupsen/logrus # github.com/soheilhy/cmux v0.1.4 github.com/soheilhy/cmux @@ -841,16 +886,19 @@ github.com/spf13/afero/mem # github.com/spf13/cobra v0.0.5 github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 github.com/syndtr/gocapability/capability # github.com/tchap/go-patricia v2.3.0+incompatible +## explicit github.com/tchap/go-patricia/patricia # github.com/theckman/go-flock v0.7.1 github.com/theckman/go-flock # github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 github.com/tmc/grpc-websocket-proxy/wsproxy # github.com/urfave/cli v1.22.2 +## explicit github.com/urfave/cli # github.com/urfave/cli/v2 v2.0.0 github.com/urfave/cli/v2 @@ -891,6 +939,7 @@ github.com/xiang90/probing # go.etcd.io/bbolt v1.3.3 go.etcd.io/bbolt # go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f +## explicit go.etcd.io/etcd/auth go.etcd.io/etcd/auth/authpb go.etcd.io/etcd/client @@ -1004,6 +1053,7 @@ go.uber.org/zap/internal/color go.uber.org/zap/internal/exit go.uber.org/zap/zapcore # golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 +## explicit golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish golang.org/x/crypto/chacha20 @@ -1023,6 +1073,7 @@ golang.org/x/crypto/ssh golang.org/x/crypto/ssh/internal/bcrypt_pbkdf golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a +## explicit golang.org/x/net/bpf golang.org/x/net/context golang.org/x/net/context/ctxhttp @@ -1052,6 +1103,7 @@ golang.org/x/sync/errgroup golang.org/x/sync/semaphore golang.org/x/sync/singleflight # golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e +## explicit golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows @@ -1149,6 +1201,7 @@ google.golang.org/genproto/googleapis/api/httpbody google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/protobuf/field_mask # google.golang.org/grpc v1.26.0 +## explicit google.golang.org/grpc google.golang.org/grpc/attributes google.golang.org/grpc/backoff @@ -1196,6 +1249,8 @@ gopkg.in/gcfg.v1/token gopkg.in/gcfg.v1/types # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 +# gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 +## explicit # gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 # gopkg.in/square/go-jose.v2 v2.2.2 @@ -1206,8 +1261,10 @@ gopkg.in/square/go-jose.v2/jwt # gopkg.in/warnings.v0 v0.1.1 gopkg.in/warnings.v0 # gopkg.in/yaml.v2 v2.2.8 +## explicit gopkg.in/yaml.v2 # k8s.io/api v0.18.0 => github.com/rancher/kubernetes/staging/src/k8s.io/api v1.18.3-k3s1 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -1292,6 +1349,7 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition # k8s.io/apimachinery v0.18.0 => github.com/rancher/kubernetes/staging/src/k8s.io/apimachinery v1.18.3-k3s1 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -1354,6 +1412,7 @@ k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/apiserver v0.0.0 => github.com/rancher/kubernetes/staging/src/k8s.io/apiserver v1.18.3-k3s1 +## explicit k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration k8s.io/apiserver/pkg/admission/initializer @@ -1497,6 +1556,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource # k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => github.com/rancher/kubernetes/staging/src/k8s.io/client-go v1.18.3-k3s1 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached k8s.io/client-go/discovery/cached/disk @@ -1731,6 +1791,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue # k8s.io/cloud-provider v0.0.0 => github.com/rancher/kubernetes/staging/src/k8s.io/cloud-provider v1.18.3-k3s1 +## explicit k8s.io/cloud-provider k8s.io/cloud-provider/api k8s.io/cloud-provider/node/helpers @@ -1760,6 +1821,7 @@ k8s.io/code-generator/cmd/lister-gen/generators k8s.io/code-generator/pkg/namer k8s.io/code-generator/pkg/util # k8s.io/component-base v0.0.0 => github.com/rancher/kubernetes/staging/src/k8s.io/component-base v1.18.3-k3s1 +## explicit k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag k8s.io/component-base/codec @@ -1778,6 +1840,7 @@ k8s.io/component-base/metrics/testutil k8s.io/component-base/version k8s.io/component-base/version/verflag # k8s.io/cri-api v0.0.0 => github.com/rancher/kubernetes/staging/src/k8s.io/cri-api v1.18.3-k3s1 +## explicit k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1alpha2 # k8s.io/csi-translation-lib v0.0.0 => github.com/rancher/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.3-k3s1 @@ -1794,6 +1857,7 @@ k8s.io/gengo/types # k8s.io/heapster v1.2.0-beta.1 k8s.io/heapster/metrics/api/v1/types # k8s.io/klog v1.0.0 +## explicit k8s.io/klog # k8s.io/kube-aggregator v0.18.0 => github.com/rancher/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.3-k3s1 k8s.io/kube-aggregator/pkg/apis/apiregistration @@ -1921,6 +1985,7 @@ k8s.io/kubelet/config/v1beta1 k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 k8s.io/kubelet/pkg/apis/pluginregistration/v1 # k8s.io/kubernetes v1.18.0 => github.com/rancher/kubernetes v1.18.3-k3s1 +## explicit k8s.io/kubernetes/cmd/cloud-controller-manager/app k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/scheme @@ -2759,6 +2824,62 @@ sigs.k8s.io/structured-merge-diff/v3/schema sigs.k8s.io/structured-merge-diff/v3/typed sigs.k8s.io/structured-merge-diff/v3/value # sigs.k8s.io/yaml v1.2.0 +## explicit sigs.k8s.io/yaml # vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc vbom.ml/util/sortorder +# github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7-0.20190926181021-82c7525d98c8 +# github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83 +# github.com/containerd/cgroups => github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 +# github.com/containerd/console => github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 +# github.com/containerd/containerd => github.com/rancher/containerd v1.3.3-k3s2 +# github.com/containerd/continuity => github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02 +# github.com/containerd/cri => github.com/rancher/cri v1.3.0-k3s.6 +# github.com/containerd/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c +# github.com/containerd/go-runc => github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda +# github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd +# github.com/coreos/flannel => github.com/rancher/flannel v0.11.0-k3s.2 +# github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +# github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190205005809-0d3efadf0154 +# github.com/docker/docker => github.com/docker/docker v17.12.0-ce-rc1.0.20190219214528-cbe11bdc6da8+incompatible +# github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34 +# github.com/go-critic/go-critic => github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540 +# github.com/golangci/errcheck => github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 +# github.com/golangci/go-tools => github.com/golangci/go-tools v0.0.0-20190318060251-af6baa5dc196 +# github.com/golangci/gofmt => github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98 +# github.com/golangci/gosec => github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547 +# github.com/golangci/ineffassign => github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc +# github.com/golangci/lint-1 => github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217 +# github.com/kubernetes-sigs/cri-tools => github.com/rancher/cri-tools v1.18.0-k3s1 +# github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 +# github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v0.0.0-20180911193056-5684b8af48c1 +# github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2 +# github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 +# github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 +# github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a +# k8s.io/api => github.com/rancher/kubernetes/staging/src/k8s.io/api v1.18.3-k3s1 +# k8s.io/apiextensions-apiserver => github.com/rancher/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.3-k3s1 +# k8s.io/apimachinery => github.com/rancher/kubernetes/staging/src/k8s.io/apimachinery v1.18.3-k3s1 +# k8s.io/apiserver => github.com/rancher/kubernetes/staging/src/k8s.io/apiserver v1.18.3-k3s1 +# k8s.io/cli-runtime => github.com/rancher/kubernetes/staging/src/k8s.io/cli-runtime v1.18.3-k3s1 +# k8s.io/client-go => github.com/rancher/kubernetes/staging/src/k8s.io/client-go v1.18.3-k3s1 +# k8s.io/cloud-provider => github.com/rancher/kubernetes/staging/src/k8s.io/cloud-provider v1.18.3-k3s1 +# k8s.io/cluster-bootstrap => github.com/rancher/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.3-k3s1 +# k8s.io/code-generator => github.com/rancher/kubernetes/staging/src/k8s.io/code-generator v1.18.3-k3s1 +# k8s.io/component-base => github.com/rancher/kubernetes/staging/src/k8s.io/component-base v1.18.3-k3s1 +# k8s.io/cri-api => github.com/rancher/kubernetes/staging/src/k8s.io/cri-api v1.18.3-k3s1 +# k8s.io/csi-translation-lib => github.com/rancher/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.3-k3s1 +# k8s.io/kube-aggregator => github.com/rancher/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.3-k3s1 +# k8s.io/kube-controller-manager => github.com/rancher/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.3-k3s1 +# k8s.io/kube-proxy => github.com/rancher/kubernetes/staging/src/k8s.io/kube-proxy v1.18.3-k3s1 +# k8s.io/kube-scheduler => github.com/rancher/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.3-k3s1 +# k8s.io/kubectl => github.com/rancher/kubernetes/staging/src/k8s.io/kubectl v1.18.3-k3s1 +# k8s.io/kubelet => github.com/rancher/kubernetes/staging/src/k8s.io/kubelet v1.18.3-k3s1 +# k8s.io/kubernetes => github.com/rancher/kubernetes v1.18.3-k3s1 +# k8s.io/legacy-cloud-providers => github.com/rancher/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.3-k3s1 +# k8s.io/metrics => github.com/rancher/kubernetes/staging/src/k8s.io/metrics v1.18.3-k3s1 +# k8s.io/node-api => github.com/rancher/kubernetes/staging/src/k8s.io/node-api v1.18.3-k3s1 +# k8s.io/sample-apiserver => github.com/rancher/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.3-k3s1 +# k8s.io/sample-cli-plugin => github.com/rancher/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.18.3-k3s1 +# k8s.io/sample-controller => github.com/rancher/kubernetes/staging/src/k8s.io/sample-controller v1.18.3-k3s1 +# mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34