#2 Clean up and update to latest upstream
Merged 4 years ago by jchaloup. Opened 4 years ago by kasong.
rpms/ kasong/kubernetes master  into  master

file modified
+1
@@ -1,2 +1,3 @@ 

  /contrib-5b445f1.tar.gz

  /kubernetes-6c143d3.tar.gz

+ /kubernetes-52c56ce.tar.gz

@@ -1,63 +0,0 @@ 

- From 2fce9e3eefd9dda6d74660ebe49f731f8b11111a Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Thu, 2 Jan 2020 12:29:57 +0100

- Subject: [PATCH] Hide bearer token in logs: upstream #81330

- 

- ---

-  .../k8s.io/client-go/transport/round_trippers.go   | 33 ++++++++++++++++++++++

-  1 file changed, 33 insertions(+)

- 

- diff --git a/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/transport/round_trippers.go b/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/transport/round_trippers.go

- index 117a9c8..844ee9a 100644

- --- a/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/transport/round_trippers.go

- +++ b/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/transport/round_trippers.go

- @@ -409,6 +409,38 @@ func (rt *debuggingRoundTripper) CancelRequest(req *http.Request) {

-  	}

-  }

-  

- +var knownAuthTypes = map[string]bool{

- +	"bearer":    true,

- +	"basic":     true,

- +	"negotiate": true,

- +}

- +

- +// maskValue masks credential content from authorization headers

- +// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization

- +func maskValue(key string, value string) string {

- +	if !strings.EqualFold(key, "Authorization") {

- +		return value

- +	}

- +	if len(value) == 0 {

- +		return ""

- +	}

- +	var authType string

- +	if i := strings.Index(value, " "); i > 0 {

- +		authType = value[0:i]

- +	} else {

- +		authType = value

- +	}

- +	if !knownAuthTypes[strings.ToLower(authType)] {

- +		return "<masked>"

- +	}

- +	if len(value) > len(authType)+1 {

- +		value = authType + " <masked>"

- +	} else {

- +		value = authType

- +	}

- +	return value

- +}

- +

-  func (rt *debuggingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {

-  	reqInfo := newRequestInfo(req)

-  

- @@ -423,6 +455,7 @@ func (rt *debuggingRoundTripper) RoundTrip(req *http.Request) (*http.Response, e

-  		klog.Infof("Request Headers:")

-  		for key, values := range reqInfo.RequestHeaders {

-  			for _, value := range values {

- +				value = maskValue(key, value)

-  				klog.Infof("    %s: %s", key, value)

-  			}

-  		}

- -- 

- 2.7.5

- 

file removed
-982
@@ -1,982 +0,0 @@ 

- From bc080379953dfe78e690d739b42e27945e9e6891 Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Thu, 2 Jan 2020 12:32:14 +0100

- Subject: [PATCH] Remove go mod

- 

- ---

-  src/k8s.io/kubernetes/go.mod | 470 -----------------------------------------

-  src/k8s.io/kubernetes/go.sum | 485 -------------------------------------------

-  2 files changed, 955 deletions(-)

-  delete mode 100644 src/k8s.io/kubernetes/go.mod

-  delete mode 100644 src/k8s.io/kubernetes/go.sum

- 

- diff --git a/src/k8s.io/kubernetes/go.mod b/src/k8s.io/kubernetes/go.mod

- deleted file mode 100644

- index 63b228b..0000000

- --- a/src/k8s.io/kubernetes/go.mod

- +++ /dev/null

- @@ -1,470 +0,0 @@

- -// This is a generated file. Do not edit directly.

- -// Run hack/pin-dependency.sh to change pinned dependency versions.

- -// Run hack/update-vendor.sh to update go.mod files and the vendor directory.

- -

- -module k8s.io/kubernetes

- -

- -go 1.12

- -

- -require (

- -	bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690

- -	github.com/Azure/azure-sdk-for-go v21.4.0+incompatible

- -	github.com/Azure/go-autorest v11.1.2+incompatible

- -	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.11

- -	github.com/PuerkitoBio/purell v1.1.0

- -	github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d

- -	github.com/Rican7/retry v0.1.0 // indirect

- -	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e

- -	github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 // indirect

- -	github.com/aws/aws-sdk-go v1.16.26

- -	github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e

- -	github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e

- -	github.com/blang/semver v3.5.0+incompatible

- -	github.com/boltdb/bolt v1.3.1 // indirect

- -	github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c

- -	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/codegangsta/negroni v1.0.0 // indirect

- -	github.com/container-storage-interface/spec v1.1.0

- -	github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa // indirect

- -	github.com/containerd/containerd v1.0.2 // indirect

- -	github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 // indirect

- -	github.com/containernetworking/cni v0.6.0

- -	github.com/coreos/etcd v3.3.13+incompatible

- -	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.30.0 // indirect

- -	github.com/cpuguy83/go-md2man v1.0.4

- -	github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299 // indirect

- -	github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c

- -	github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266

- -	github.com/davecgh/go-spew v1.1.1

- -	github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd

- -	github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff

- -	github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0

- -	github.com/docker/go-connections v0.3.0

- -	github.com/docker/go-units v0.3.3

- -	github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789

- -	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 // indirect

- -	github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550

- -	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d

- -	github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96

- -	github.com/fsnotify/fsnotify v1.4.7

- -	github.com/go-openapi/loads v0.17.2

- -	github.com/go-openapi/spec v0.17.2

- -	github.com/go-openapi/strfmt v0.17.0

- -	github.com/go-openapi/validate v0.18.0

- -	github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect

- -	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.2.0

- -	github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect

- -	github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect

- -	github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect

- -	github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a

- -	github.com/google/certificate-transparency-go v1.0.21 // indirect

- -	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf

- -	github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d

- -	github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8

- -	github.com/gorilla/context v1.1.1 // indirect

- -	github.com/gorilla/mux v1.7.0 // indirect

- -	github.com/hashicorp/golang-lru v0.5.0

- -	github.com/hashicorp/hcl v0.0.0-20160711231752-d8c773c4cba1 // indirect

- -	github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0

- -	github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect

- -	github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect

- -	github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 // indirect

- -	github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c

- -	github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be

- -	github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024

- -	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 // indirect

- -	github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 // indirect

- -	github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51 // indirect

- -	github.com/kr/text v0.0.0-20130911015532-6807e777504f // indirect

- -	github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875

- -	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de

- -	github.com/lithammer/dedent v1.1.0

- -	github.com/lpabon/godbc v0.1.1 // indirect

- -	github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4 // indirect

- -	github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de // indirect

- -	github.com/mesos/mesos-go v0.0.9 // indirect

- -	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 // indirect

- -	github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77 // indirect

- -	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7

- -	github.com/mitchellh/mapstructure v1.1.2

- -	github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb // indirect

- -	github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect

- -	github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058 // indirect

- -	github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d

- -	github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a

- -	github.com/onsi/ginkgo v1.6.0

- -	github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3

- -	github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420

- -	github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634 // indirect

- -	github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1

- -	github.com/opencontainers/runtime-spec v1.0.0 // indirect

- -	github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9

- -	github.com/pborman/uuid v1.2.0

- -	github.com/pelletier/go-toml v1.2.0 // indirect

- -	github.com/pkg/errors v0.8.0

- -	github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6 // indirect

- -	github.com/pmezard/go-difflib v1.0.0

- -	github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20 // indirect

- -	github.com/prometheus/client_golang v0.9.2

- -	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910

- -	github.com/prometheus/common v0.0.0-20181126121408-4724e9255275

- -	github.com/quobyte/api v0.1.2

- -	github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8

- -	github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5

- -	github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect

- -	github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db // indirect

- -	github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d

- -	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect

- -	github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97

- -	github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a // indirect

- -	github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937

- -	github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 // indirect

- -	github.com/spf13/pflag v1.0.1

- -	github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8

- -	github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc

- -	github.com/stretchr/testify v1.2.2

- -	github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 // indirect

- -	github.com/urfave/negroni v1.0.0 // indirect

- -	github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e

- -	github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 // indirect

- -	github.com/vmware/govmomi v0.20.1

- -	github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc

- -	github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57

- -	github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect

- -	golang.org/x/crypto v0.0.0-20181025213731-e84da0312774

- -	golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1

- -	golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc

- -	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a

- -	golang.org/x/sys v0.0.0-20190312061237-fead79001313

- -	golang.org/x/time v0.0.0-20161028155119-f51c12702a4d

- -	golang.org/x/tools v0.0.0-20190328211700-ab21143f2384

- -	gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485

- -	google.golang.org/api v0.0.0-20181220000619-583d854617af

- -	google.golang.org/grpc v1.13.0

- -	gopkg.in/gcfg.v1 v1.2.0

- -	gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84

- -	gopkg.in/yaml.v2 v2.2.4

- -	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/component-base v0.0.0

- -	k8s.io/cri-api v0.0.0

- -	k8s.io/csi-translation-lib v0.0.0

- -	k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af

- -	k8s.io/heapster v1.2.0-beta.1

- -	k8s.io/klog v0.3.1

- -	k8s.io/kube-aggregator v0.0.0

- -	k8s.io/kube-controller-manager v0.0.0

- -	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30

- -	k8s.io/kube-proxy v0.0.0

- -	k8s.io/kube-scheduler v0.0.0

- -	k8s.io/kubelet v0.0.0

- -	k8s.io/legacy-cloud-providers v0.0.0

- -	k8s.io/metrics v0.0.0

- -	k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3

- -	k8s.io/sample-apiserver v0.0.0

- -	k8s.io/utils v0.0.0-20190221042446-c2654d5206da

- -	sigs.k8s.io/kustomize v2.0.3+incompatible

- -	sigs.k8s.io/yaml v1.1.0

- -	vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc

- -)

- -

- -replace (

- -	bitbucket.org/bertimus9/systemstat => bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690

- -	cloud.google.com/go => cloud.google.com/go v0.34.0

- -	github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v21.4.0+incompatible

- -	github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78

- -	github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.1.2+incompatible

- -	github.com/BurntSushi/toml => github.com/BurntSushi/toml v0.3.0

- -	github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802

- -	github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100

- -	github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab

- -	github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd

- -	github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.11

- -	github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d

- -	github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46

- -	github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.0

- -	github.com/PuerkitoBio/urlesc => github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578

- -	github.com/Rican7/retry => github.com/Rican7/retry v0.1.0

- -	github.com/armon/circbuf => github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e

- -	github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf

- -	github.com/auth0/go-jwt-middleware => github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7

- -	github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.16.26

- -	github.com/bazelbuild/bazel-gazelle => github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e

- -	github.com/bazelbuild/buildtools => github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e

- -	github.com/beorn7/perks => github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973

- -	github.com/blang/semver => github.com/blang/semver v3.5.0+incompatible

- -	github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1

- -	github.com/cespare/prettybench => github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c

- -	github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5

- -	github.com/client9/misspell => github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda

- -	github.com/cloudflare/cfssl => github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf

- -	github.com/clusterhq/flocker-go => github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313

- -	github.com/codedellemc/goscaleio => github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885

- -	github.com/codegangsta/negroni => github.com/codegangsta/negroni v1.0.0

- -	github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.1.0

- -	github.com/containerd/console => github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa

- -	github.com/containerd/containerd => github.com/containerd/containerd v1.0.2

- -	github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20

- -	github.com/containernetworking/cni => github.com/containernetworking/cni v0.6.0

- -	github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.1-coreos.6

- -	github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible

- -	github.com/coreos/go-oidc => github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416

- -	github.com/coreos/go-semver => github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a

- -	github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7

- -	github.com/coreos/pkg => github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea

- -	github.com/coreos/rkt => github.com/coreos/rkt v1.30.0

- -	github.com/cpuguy83/go-md2man => github.com/cpuguy83/go-md2man v1.0.4

- -	github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299

- -	github.com/d2g/dhcp4 => github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c

- -	github.com/d2g/dhcp4client => github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266

- -	github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1

- -	github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd

- -	github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda

- -	github.com/dnaeon/go-vcr => github.com/dnaeon/go-vcr v1.0.1

- -	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff

- -	github.com/docker/docker => github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0

- -	github.com/docker/go-connections => github.com/docker/go-connections v0.3.0

- -	github.com/docker/go-units => github.com/docker/go-units v0.3.3

- -	github.com/docker/libnetwork => github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789

- -	github.com/docker/spdystream => github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96

- -	github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e

- -	github.com/emicklei/go-restful => github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633

- -	github.com/euank/go-kmsg-parser => github.com/euank/go-kmsg-parser v2.0.0+incompatible

- -	github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550

- -	github.com/exponent-io/jsonpath => github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d

- -	github.com/fatih/camelcase => github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96

- -	github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.7

- -	github.com/ghodss/yaml => github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4

- -	github.com/globalsign/mgo => github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8

- -	github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.17.2

- -	github.com/go-openapi/errors => github.com/go-openapi/errors v0.17.2

- -	github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.0

- -	github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.0

- -	github.com/go-openapi/loads => github.com/go-openapi/loads v0.17.2

- -	github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.17.2

- -	github.com/go-openapi/spec => github.com/go-openapi/spec v0.17.2

- -	github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.17.0

- -	github.com/go-openapi/swag => github.com/go-openapi/swag v0.17.2

- -	github.com/go-openapi/validate => github.com/go-openapi/validate v0.18.0

- -	github.com/go-ozzo/ozzo-validation => github.com/go-ozzo/ozzo-validation v3.5.0+incompatible

- -	github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55

- -	github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415

- -	github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b

- -	github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903

- -	github.com/golang/mock => github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01

- -	github.com/golang/protobuf => github.com/golang/protobuf v1.2.0

- -	github.com/golangplus/bytes => github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450

- -	github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995

- -	github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e

- -	github.com/google/btree => github.com/google/btree v0.0.0-20160524151835-7d79101e329e

- -	github.com/google/cadvisor => github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a

- -	github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.21

- -	github.com/google/go-cmp => github.com/google/go-cmp v0.3.0

- -	github.com/google/gofuzz => github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf

- -	github.com/google/uuid => github.com/google/uuid v1.0.0

- -	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d

- -	github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8

- -	github.com/gopherjs/gopherjs => github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1

- -	github.com/gorilla/context => github.com/gorilla/context v1.1.1

- -	github.com/gorilla/mux => github.com/gorilla/mux v1.7.0

- -	github.com/gorilla/websocket => github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c

- -	github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7

- -	github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79

- -	github.com/grpc-ecosystem/go-grpc-prometheus => github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611

- -	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.3.0

- -	github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.0

- -	github.com/hashicorp/hcl => github.com/hashicorp/hcl v0.0.0-20160711231752-d8c773c4cba1

- -	github.com/heketi/heketi => github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0

- -	github.com/heketi/rest => github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413

- -	github.com/heketi/tests => github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6

- -	github.com/heketi/utils => github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64

- -	github.com/hpcloud/tail => github.com/hpcloud/tail v1.0.0

- -	github.com/imdario/mergo => github.com/imdario/mergo v0.3.5

- -	github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0

- -	github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af

- -	github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c

- -	github.com/json-iterator/go => github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be

- -	github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024

- -	github.com/jteeuwen/go-bindata => github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7

- -	github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible

- -	github.com/kardianos/osext => github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22

- -	github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5

- -	github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.1

- -	github.com/kr/fs => github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169

- -	github.com/kr/pretty => github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51

- -	github.com/kr/text => github.com/kr/text v0.0.0-20130911015532-6807e777504f

- -	github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875

- -	github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de

- -	github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0

- -	github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1

- -	github.com/magiconair/properties => github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4

- -	github.com/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329

- -	github.com/marstr/guid => github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c

- -	github.com/mattn/go-shellwords => github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de

- -	github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.1

- -	github.com/mesos/mesos-go => github.com/mesos/mesos-go v0.0.9

- -	github.com/mholt/caddy => github.com/mholt/caddy v0.0.0-20180213163048-2de495001514

- -	github.com/miekg/dns => github.com/miekg/dns v0.0.0-20160614162101-5d001d020961

- -	github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2

- -	github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77

- -	github.com/mitchellh/go-wordwrap => github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7

- -	github.com/mitchellh/mapstructure => github.com/mitchellh/mapstructure v1.1.2

- -	github.com/modern-go/concurrent => github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd

- -	github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.1

- -	github.com/mohae/deepcopy => github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb

- -	github.com/morikuni/aec => github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c

- -	github.com/mrunalp/fileutils => github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058

- -	github.com/munnerz/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d

- -	github.com/mvdan/xurls => github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a

- -	github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f

- -	github.com/natefinch/lumberjack => github.com/natefinch/lumberjack v2.0.0+incompatible

- -	github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.6.0

- -	github.com/onsi/gomega => github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3

- -	github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420

- -	github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634

- -	github.com/opencontainers/runc => github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1

- -	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.0

- -	github.com/opencontainers/selinux => github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9

- -	github.com/pborman/uuid => github.com/pborman/uuid v1.2.0

- -	github.com/pelletier/go-toml => github.com/pelletier/go-toml v1.2.0

- -	github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible

- -	github.com/pkg/errors => github.com/pkg/errors v0.8.0

- -	github.com/pkg/sftp => github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6

- -	github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0

- -	github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021

- -	github.com/pquerna/ffjson => github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20

- -	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

- -	github.com/quobyte/api => github.com/quobyte/api v0.1.2

- -	github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446

- -	github.com/robfig/cron => github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8

- -	github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c

- -	github.com/russross/blackfriday => github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5

- -	github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0

- -	github.com/seccomp/libseccomp-golang => github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e

- -	github.com/shurcooL/sanitized_anchor_name => github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db

- -	github.com/sigma/go-inotify => github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d

- -	github.com/sirupsen/logrus => github.com/sirupsen/logrus v1.2.0

- -	github.com/smartystreets/assertions => github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d

- -	github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a

- -	github.com/soheilhy/cmux => github.com/soheilhy/cmux v0.1.3

- -	github.com/spf13/afero => github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97

- -	github.com/spf13/cast => github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a

- -	github.com/spf13/cobra => github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937

- -	github.com/spf13/jwalterweatherman => github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80

- -	github.com/spf13/pflag => github.com/spf13/pflag v1.0.1

- -	github.com/spf13/viper => github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8

- -	github.com/storageos/go-api => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc

- -	github.com/stretchr/objx => github.com/stretchr/objx v0.1.1

- -	github.com/stretchr/testify => github.com/stretchr/testify v1.2.2

- -	github.com/syndtr/gocapability => github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4

- -	github.com/tmc/grpc-websocket-proxy => github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8

- -	github.com/urfave/negroni => github.com/urfave/negroni v1.0.0

- -	github.com/vishvananda/netlink => github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e

- -	github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936

- -	github.com/vmware/govmomi => github.com/vmware/govmomi v0.20.1

- -	github.com/vmware/photon-controller-go-sdk => github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc

- -	github.com/xanzy/go-cloudstack => github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57

- -	github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18

- -	github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1

- -	go.uber.org/atomic => go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569

- -	go.uber.org/multierr => go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df

- -	go.uber.org/zap => go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15

- -	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774

- -	golang.org/x/exp => golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495

- -	golang.org/x/image => golang.org/x/image v0.0.0-20190227222117-0694c2d4d067

- -	golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1

- -	golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6

- -	golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc

- -	golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a

- -	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f

- -	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503

- -	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db

- -	golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d

- -	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9

- -	gonum.org/v1/gonum => gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485

- -	gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e

- -	google.golang.org/api => google.golang.org/api v0.0.0-20181220000619-583d854617af

- -	google.golang.org/appengine => google.golang.org/appengine v1.5.0

- -	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6

- -	google.golang.org/grpc => google.golang.org/grpc v1.13.0

- -	gopkg.in/check.v1 => gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405

- -	gopkg.in/fsnotify.v1 => gopkg.in/fsnotify.v1 v1.4.7

- -	gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0

- -	gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0

- -	gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7

- -	gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84

- -	gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7

- -	gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.1

- -	gopkg.in/yaml.v1 => gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0

- -	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.4

- -	gotest.tools => gotest.tools v2.2.0+incompatible

- -	k8s.io/api => ./staging/src/k8s.io/api

- -	k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver

- -	k8s.io/apimachinery => ./staging/src/k8s.io/apimachinery

- -	k8s.io/apiserver => ./staging/src/k8s.io/apiserver

- -	k8s.io/cli-runtime => ./staging/src/k8s.io/cli-runtime

- -	k8s.io/client-go => ./staging/src/k8s.io/client-go

- -	k8s.io/cloud-provider => ./staging/src/k8s.io/cloud-provider

- -	k8s.io/cluster-bootstrap => ./staging/src/k8s.io/cluster-bootstrap

- -	k8s.io/code-generator => ./staging/src/k8s.io/code-generator

- -	k8s.io/component-base => ./staging/src/k8s.io/component-base

- -	k8s.io/cri-api => ./staging/src/k8s.io/cri-api

- -	k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib

- -	k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af

- -	k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1

- -	k8s.io/klog => k8s.io/klog v0.3.1

- -	k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator

- -	k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager

- -	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30

- -	k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy

- -	k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler

- -	k8s.io/kubectl => ./staging/src/k8s.io/kubectl

- -	k8s.io/kubelet => ./staging/src/k8s.io/kubelet

- -	k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers

- -	k8s.io/metrics => ./staging/src/k8s.io/metrics

- -	k8s.io/node-api => ./staging/src/k8s.io/node-api

- -	k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3

- -	k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver

- -	k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin

- -	k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller

- -	k8s.io/utils => k8s.io/utils v0.0.0-20190221042446-c2654d5206da

- -	modernc.org/cc => modernc.org/cc v1.0.0

- -	modernc.org/golex => modernc.org/golex v1.0.0

- -	modernc.org/mathutil => modernc.org/mathutil v1.0.0

- -	modernc.org/strutil => modernc.org/strutil v1.0.0

- -	modernc.org/xc => modernc.org/xc v1.0.0

- -	sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible

- -	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2

- -	sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0

- -	vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc

- -)

- diff --git a/src/k8s.io/kubernetes/go.sum b/src/k8s.io/kubernetes/go.sum

- deleted file mode 100644

- index c7ec58f..0000000

- --- a/src/k8s.io/kubernetes/go.sum

- +++ /dev/null

- @@ -1,485 +0,0 @@

- -bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 h1:N9r8OBSXAgEUfho3SQtZLY8zo6E1OdOMvelvP22aVFc=

- -bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=

- -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=

- -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

- -github.com/Azure/azure-sdk-for-go v21.4.0+incompatible h1:rsdM2HqR64WhJv7YqMAjWOLAebbx4c9/gzcLC7yoDDE=

- -github.com/Azure/azure-sdk-for-go v21.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=

- -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=

- -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=

- -github.com/Azure/go-autorest v11.1.2+incompatible h1:viZ3tV5l4gE2Sw0xrasFHytCGtzYCrT+um/rrSQ1BfA=

- -github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=

- -github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY=

- -github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

- -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

- -github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100 h1:EXrpgbxknFeRM6X/OgRqcbVtl5zqUFD5eV8O8M1BLzo=

- -github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=

- -github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab h1:UKkYhof1njT1/xq4SEg5z+VpTgjmNeHwPGRQl7takDI=

- -github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=

- -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=

- -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=

- -github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q=

- -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=

- -github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d h1:u64+IetywsPQ0gJ/4cXBJ/KiXV9xTKRMoaCOzW9PI3g=

- -github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=

- -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=

- -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=

- -github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=

- -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=

- -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=

- -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=

- -github.com/Rican7/retry v0.1.0 h1:FqK94z34ly8Baa6K+G8Mmza9rYWTKOJk+yckIBB5qVk=

- -github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=

- -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=

- -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=

- -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=

- -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=

- -github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 h1:irR1cO6eek3n5uquIVaRAsQmZnlsfPuHNz31cXo4eyk=

- -github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=

- -github.com/aws/aws-sdk-go v1.16.26 h1:GWkl3rkRO/JGRTWoLLIqwf7AWC4/W/1hMOUZqmX0js4=

- -github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=

- -github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e h1:k7E/Rdb9kYVDDrdCX46/GLgHhbxBs4BQz7+FDRf8lcg=

- -github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us=

- -github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e h1:VuTBHPJNCQ88Okm9ld5SyLCvU50soWJYQYjQFdcDxew=

- -github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=

- -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=

- -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

- -github.com/blang/semver v3.5.0+incompatible h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs=

- -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=

- -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=

- -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=

- -github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c h1:p8i+qCbr/dNhS2FoQhRpSS7X5+IlxTa94nRNYXu4fyo=

- -github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=

- -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=

- -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=

- -github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda h1:QBkCW6crBwWeRDhv99atmW1EZ7gyxAlHA2tGu+P9020=

- -github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

- -github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf h1:eOyFuj3h/Vj5e4voOM16NNrHsUR3jhD0duh76LHMj6Y=

- -github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=

- -github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 h1:eIHD9GNM3Hp7kcRW5mvcz7WTR3ETeoYYKwpgA04kaXE=

- -github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=

- -github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 h1:R+oTsULuK7IPPnvgrETxBo4W5UU3GDcX0jQMxuW4hVU=

- -github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885/go.mod h1:JIHmDHNZO4tmA3y3RHp6+Gap6kFsNf55W9Pn/3YS9IY=

- -github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY=

- -github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=

- -github.com/container-storage-interface/spec v1.1.0 h1:qPsTqtR1VUPvMPeK0UnCZMtXaKGyyLPG8gj/wG6VqMs=

- -github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=

- -github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa h1:GnRy2maqb8vcJhYRN5L+5WyYNKfUG4otiz2zxE182ng=

- -github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=

- -github.com/containerd/containerd v1.0.2 h1:AcqeeOunmUuo2CvPPtHMhWn7mi54clu+j9yqXKxGFtk=

- -github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=

- -github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 h1:14r0i3IeJj6zkNLigAJiv/TWSR8EY+pxIjv5tFiT+n8=

- -github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=

- -github.com/containernetworking/cni v0.6.0 h1:FXICGBZNMtdHlW65trpoHviHctQD3seWhRRcqp2hMOU=

- -github.com/containernetworking/cni v0.6.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=

- -github.com/coreos/bbolt v1.3.1-coreos.6 h1:uTXKg9gY70s9jMAKdfljFQcuh4e/BXOM+V+d00KFj3A=

- -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=

- -github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=

- -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

- -github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416 h1:X+JQSgXg3CcxgcBoMAqU8NoS0fch8zHxjiKWcXclxaI=

- -github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=

- -github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a h1:WqY2Kv7eI1jeoU3pC05YYK/kK4tdXyLzzaBzCR51r9M=

- -github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=

- -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM=

- -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=

- -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea h1:n2Ltr3SrfQlf/9nOna1DoGKxLx3qTSI8Ttl6Xrqp6mw=

- -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=

- -github.com/coreos/rkt v1.30.0 h1:Kkt6sYeEGKxA3Y7SCrY+nHoXkWed6Jr2BBY42GqMymM=

- -github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U=

- -github.com/cpuguy83/go-md2man v1.0.4 h1:OwjhDpK9YGCcI5CDf8HcdfsXqr6znFyAJfuZ27ixJsc=

- -github.com/cpuguy83/go-md2man v1.0.4/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY=

- -github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299 h1:2pOMM/RaFhI52FyCITl8aTf5HZ9LoHD8SkjbghAEG1E=

- -github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=

- -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c h1:Xo2rK1pzOm0jO6abTPIQwbAmqBIOj132otexc1mmzFc=

- -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=

- -github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266 h1:1iKpuOrCnaRBKKNoChzmVDXeoFuCS7wsooRncvzVPxo=

- -github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=

- -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

- -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

- -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=

- -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=

- -github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda h1:NyywMz59neOoVRFDz+ccfKWxn784fiHMDnZSy6T+JXY=

- -github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

- -github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=

- -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=

- -github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg=

- -github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=

- -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 h1:w3NnFcKR5241cfmQU5ZZAsf0xcpId6mWOupTvJlUX2U=

- -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=

- -github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o=

- -github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=

- -github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=

- -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

- -github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789 h1:8rOK787QQFFZJcOLXPiKKidY/ie2OQpblM5gEAaenPs=

- -github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=

- -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=

- -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=

- -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=

- -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=

- -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=

- -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=

- -github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY=

- -github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=

- -github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550 h1:mV9jbLoSW/8m4VK16ZkHTozJa8sesK5u5kTMFysTYac=

- -github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=

- -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=

- -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=

- -github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96 h1:5e8GDOdG6jKeeqNGbR+tlmqhf4vQVs3atTTMEWeEcAk=

- -github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=

- -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=

- -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

- -github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 h1:bRzFpEzvausOAt4va+I/22BZ1vXDtERngp0BNYDKej0=

- -github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

- -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=

- -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=

- -github.com/go-openapi/analysis v0.17.2 h1:eYp14J1o8TTSCzndHBtsNuckikV1PfZOSnx4BcBeu0c=

- -github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=

- -github.com/go-openapi/errors v0.17.2 h1:azEQ8Fnx0jmtFF2fxsnmd6I0x6rsweUF63qqSO1NmKk=

- -github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=

- -github.com/go-openapi/jsonpointer v0.19.0 h1:FTUMcX77w5rQkClIzDtTxvn6Bsa894CcrzNj2MMfeg8=

- -github.com/go-openapi/jsonpointer v0.19.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=

- -github.com/go-openapi/jsonreference v0.19.0 h1:BqWKpV1dFd+AuiKlgtddwVIFQsuMpxfBDBHGfM2yNpk=

- -github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=

- -github.com/go-openapi/loads v0.17.2 h1:tEXYu6Xc0pevpzzQx5ghrMN9F7IVpN/+u4iD3rkYE5o=

- -github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=

- -github.com/go-openapi/runtime v0.17.2 h1:/ZK67ikFhQAMFFH/aPu2MaGH7QjP4wHBvHYOVIzDAw0=

- -github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q=

- -github.com/go-openapi/spec v0.17.2 h1:eb2NbuCnoe8cWAxhtK6CfMWUYmiFEZJ9Hx3Z2WRwJ5M=

- -github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=

- -github.com/go-openapi/strfmt v0.17.0 h1:1isAxYf//QDTnVzbLAMrUK++0k1EjeLJU/gTOR0o3Mc=

- -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=

- -github.com/go-openapi/swag v0.17.2 h1:K/ycE/XTUDFltNHSO32cGRUhrVGJD64o8WgAIZNyc3k=

- -github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=

- -github.com/go-openapi/validate v0.18.0 h1:PVXYcP1GkTl+XIAJnyJxOmK6CSG5Q1UcvoCvNO++5Kg=

- -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=

- -github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM=

- -github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=

- -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI=

- -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=

- -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM=

- -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

- -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=

- -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

- -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=

- -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

- -github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01 h1:rtnkE5nwSSDcZrbt4gcVsFPeSXXe7Nq2vCn9DBb0Y8I=

- -github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=

- -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=

- -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

- -github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 h1:7xqw01UYS+KCI25bMrPxwNYkSns2Db1ziQPpVq99FpE=

- -github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=

- -github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 h1:f5gsjBiF9tRRVomCvrkGMMWI8W1f2OBFar2c5oakAP0=

- -github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=

- -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZPbFy2P7jH5LKJ3La+0ZeknkkmrSgqb0=

- -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=

- -github.com/google/btree v0.0.0-20160524151835-7d79101e329e h1:JHB7F/4TJCrYBW8+GZO8VkWDj1jxcWuCl6uxKODiyi4=

- -github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=

- -github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a h1:4N3IykedbdXG1ganAZbAKlViPjrtfrx2nC4qzUHieOk=

- -github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48=

- -github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE=

- -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=

- -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=

- -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

- -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=

- -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=

- -github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=

- -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

- -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d h1:7XGaL1e6bYS1yIonGp9761ExpPPV1ui0SAC59Yube9k=

- -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=

- -github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8 h1:L9JPKrtsHMQ4VCRQfHvbbHBfB2Urn8xf6QZeXZ+OrN4=

- -github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4=

- -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=

- -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

- -github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=

- -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=

- -github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=

- -github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

- -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c h1:Lh2aW+HnU2Nbe1gqD9SOJLJxW1jBMmQOktN2acDyJk8=

- -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=

- -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 h1:6TSoaYExHper8PYsJu23GWVNOyYRCSnIFyxKgLSZ54w=

- -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=

- -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE=

- -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=

- -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611 h1:f5vL2EW5pL274ztMNnizZAEa457nKyKPEaN/sm/kdBk=

- -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=

- -github.com/grpc-ecosystem/grpc-gateway v1.3.0 h1:HJtP6RRwj2EpPCD/mhAWzSvLL/dFTdPm1UrWwanoFos=

- -github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=

- -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=

- -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

- -github.com/hashicorp/hcl v0.0.0-20160711231752-d8c773c4cba1 h1:9j16AiR0R5hDbDBMzfUfIP9CUbbw6T8nYN4iZz3/wjg=

- -github.com/hashicorp/hcl v0.0.0-20160711231752-d8c773c4cba1/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=

- -github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0 h1:de43cfdq2fOAilB2qxrDnIPxL+7U/7Di3IFX8Dd0TOc=

- -github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=

- -github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 h1:nGZBOxRgSMbqjm2/FYDtO6BU4a+hfR7Om9VGQ9tbbSc=

- -github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=

- -github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 h1:oJ/NLadJn5HoxvonA6VxG31lg0d6XOURNA09BTtM4fY=

- -github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=

- -github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 h1:dk3GEa55HcRVIyCeNQmwwwH3kIXnqJPNseKOkDD+7uQ=

- -github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s=

- -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

- -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

- -github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=

- -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

- -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=

- -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

- -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=

- -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=

- -github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c h1:XpRROA6ssPlTwJI8/pH+61uieOkcJhmAFz25cu0B94Y=

- -github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=

- -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE=

- -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=

- -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc=

- -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=

- -github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7 h1:fNOeTlrOg7VMXyGgvnHoqw6owD7hd3mKSlivApPJMzI=

- -github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=

- -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=

- -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=

- -github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22 h1:eLCQd4nxsC7sumkwNg4OiB6bGiD7I5l1MSfBAxmxkKQ=

- -github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=

- -github.com/karrick/godirwalk v1.7.5 h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=

- -github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=

- -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=

- -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

- -github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 h1:YUrU1/jxRqnt0PSrKj1Uj/wEjk/fjnE80QFfi2Zlj7Q=

- -github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169/go.mod h1:glhvuHOU9Hy7/8PwwdtnarXqLagOX0b/TbZx2zLMqEg=

- -github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51 h1:kGEU5h0EzkNa+B8Q3e0GlaIocJYB1G6ZpefcceXhfgc=

- -github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=

- -github.com/kr/text v0.0.0-20130911015532-6807e777504f h1:JaNmHIV9Eby6srQVWuiQ6n8ko2o/lG6udSRCbFZe1fs=

- -github.com/kr/text v0.0.0-20130911015532-6807e777504f/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=

- -github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875 h1:s+gZ8/rkYrWgN7xTMUISDw6nspgWyju2OCKmpFBrviQ=

- -github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=

- -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=

- -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=

- -github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=

- -github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=

- -github.com/lpabon/godbc v0.1.1 h1:ilqjArN1UOENJJdM34I2YHKmF/B0gGq4VLoSGy9iAao=

- -github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=

- -github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4 h1:YVH4JcnWs1z/qQ2Dg5BnGGQL8PcUOO97Sb5w7RyuBl4=

- -github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

- -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=

- -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

- -github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c h1:N7uWGS2fTwH/4BwxbHiJZNAFTSJ5yPU0emHsQWvkxEY=

- -github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=

- -github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de h1:ryDLMbZGgf2bSdLfdQFaJuuP4No40cDUt62Mdv+3TW8=

- -github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=

- -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=

- -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

- -github.com/mesos/mesos-go v0.0.9 h1:w8V5sOEnxzHZ2kAOy273v/HgbolyI6XI+qe5jx5u+Y0=

- -github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=

- -github.com/mholt/caddy v0.0.0-20180213163048-2de495001514 h1:HQP0VPdc6NLcKWrpVDNyUZckK97MjCmK3qyXWn+j6L0=

- -github.com/mholt/caddy v0.0.0-20180213163048-2de495001514/go.mod h1:Wb1PlT4DAYSqOEd03MsqkdkXnTxA8v9pKjdpxbqM1kY=

- -github.com/miekg/dns v0.0.0-20160614162101-5d001d020961 h1:vX2vkMipgQZ8gfmAsFeZdcgmhHoB7jMo6chAtajG3AI=

- -github.com/miekg/dns v0.0.0-20160614162101-5d001d020961/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=

- -github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2 h1:v3dy+FJr7gS7nLgYG7YjX/pmUWuFdudcpnoRNHt2heo=

- -github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=

- -github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77 h1:FGBFB7BrG/ERBtzqLKd3JoDHkVSGHX7GXaWZyG1RLno=

- -github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=

- -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=

- -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=

- -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=

- -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=

- -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=

- -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

- -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=

- -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=

- -github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb h1:e+l77LJOEqXTIQihQJVkA6ZxPOUmfPM5e4H7rcpgtSk=

- -github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=

- -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=

- -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=

- -github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058 h1:A4y2IxU1GcIzlcmUlQ6yr/mrvYZhqo+HakAPwgwaa6s=

- -github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=

- -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs=

- -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=

- -github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a h1:iflecigBOhLybk910zXoXI/9D7QjBajJVxywZSU6glI=

- -github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=

- -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=

- -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=

- -github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=

- -github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=

- -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=

- -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

- -github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3 h1:EooPXg51Tn+xmWPXJUGCnJhJSpeuMlBmfJVcqIRmmv8=

- -github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

- -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420 h1:Yu3681ykYHDfLoI6XVjL4JWmkE+3TX9yfIWwRCh1kFM=

- -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

- -github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634 h1:BNgUWy7fCNMkfpyG05/9wWeDnIY4hqs9UpqkGIjAb68=

- -github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=

- -github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1 h1:3gyy8YoD+PvTCqjFmlndbR6viQwoN2MJlApTpCmrTM8=

- -github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

- -github.com/opencontainers/runtime-spec v1.0.0 h1:O6L965K88AilqnxeYPks/75HLpp4IG+FjeSCI3cVdRg=

- -github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=

- -github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9 h1:vVmQZ2IaaEe1MiuvZQbcydTbnlTG0OnZO5/4j7VZv0A=

- -github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=

- -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=

- -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

- -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

- -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

- -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

- -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

- -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=

- -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

- -github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6 h1:V8AT/I4KmIDRfObq0yBUvbD4DeaYmQY9GhC5sKl24Mo=

- -github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk=

- -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

- -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

- -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 h1:0XM1XL/OFFJjXsYXlG30spTkV/E9+gmd5GD1w2HE8xM=

- -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=

- -github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20 h1:7sBb9iOkeq+O7AXlVoH/8zpIcRXX523zMkKKspHjjx8=

- -github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=

- -github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=

- -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=

- -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=

- -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=

- -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=

- -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=

- -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=

- -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=

- -github.com/quobyte/api v0.1.2 h1:lPHLsuvtjFyk8WhC4uHoHRkScijIHcffTWBBP+YpzYo=

- -github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=

- -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=

- -github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 h1:b904/jbnmYuSPd5ojGzVTLjKPVTSj3t/e1vEPiPGjEg=

- -github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=

- -github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c h1:ht7N4d/B7Ezf58nvMNVF3OlvDlz9pp+WHVcRNS0nink=

- -github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=

- -github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5 h1:+6eORf9Bt4C3Wjt91epyu6wvLW+P6+AEODb6uKgO+4g=

- -github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

- -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=

- -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

- -github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs=

- -github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=

- -github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db h1:lrOUn8raSZS/V52c7elGaEyuogqSkEo/Qj2Auo2G1ik=

- -github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

- -github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d h1:G1nNtZVTzcCvVKMwcG0Vispo3bhc15EbjO5uamiLikI=

- -github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d/go.mod h1:stlh9OsqBQSdwxTxX73mu41BBtRbIpZLQ7flcAoxAfo=

- -github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=

- -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

- -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=

- -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

- -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=

- -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=

- -github.com/soheilhy/cmux v0.1.3 h1:09wy7WZk4AqO03yH85Ex1X+Uo3vDsil3Fa9AgF8Emss=

- -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=

- -github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97 h1:Gv1HykSEG+RKWWWkM69nPrJKhE/EM2oFb1nBWogHNv8=

- -github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

- -github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a h1:tPI5RnYZJhcXj0LhJ9pi7PS7gqOhuFR+4HEKyDz3BnQ=

- -github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=

- -github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937 h1:+ryWjMVzFAkEz5zT+Ms49aROZwxlJce3x3zLTFpkz3Y=

- -github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=

- -github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 h1:evyGXhHMrxKBDkdlSPv9HMWV2o53o+Ibhm28BGc0450=

- -github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=

- -github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4=

- -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=

- -github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8 h1:hh6dlnX5EheZdLFxYsRZt7d2z6lOnP8qVEksE/7UrhM=

- -github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=

- -github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc h1:n+WYaU0kQ6WIiuEyWSgbXqkBx16irO69kYCtwVYoO5s=

- -github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=

- -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=

- -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

- -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=

- -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

- -github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 h1:w58e6FAOMd+rUgOfhaBb+ZVOQIOfUkpv5AAQVmf6hsI=

- -github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=

- -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE=

- -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=

- -github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=

- -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=

- -github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e h1:f1yevOHP+Suqk0rVc13fIkzcLULJbyQcXDba2klljD0=

- -github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=

- -github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 h1:J9gO8RJCAFlln1jsvRba/CWVUnMHwObklfxxjErl1uk=

- -github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=

- -github.com/vmware/govmomi v0.20.1 h1:7b/SeTUB3tER8ZLGLLLH3xcnB2xeuLULXmfPFqPSRZA=

- -github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=

- -github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc h1:uyYiBHCUWsifUdIWrBzUUq9B3FSZKFTAuUyMQczS1q8=

- -github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc/go.mod h1:e6humHha1ekIwTCm+A5Qed5mG8V4JL+ChHcUOJ+L/8U=

- -github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57 h1:3OK6oXqbbEUeWvTJgg1pZgNjzdCNE6hMu2TragCfwb8=

- -github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57/go.mod h1:s3eL3z5pNXF5FVybcT+LIVdId8pYn709yv6v5mrkrQE=

- -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 h1:MPPkRncZLN9Kh4MEFmbnK4h3BD7AUmskWv2+EeZJCCs=

- -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=

- -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek=

- -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=

- -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 h1:nSQar3Y0E3VQF/VdZ8PTAilaXpER+d7ypdABCrpwMdg=

- -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

- -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df h1:shvkWr0NAZkg4nPuE3XrKP0VuBPijjk3TfX6Y6acFNg=

- -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=

- -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 h1:Z2sc4+v0JHV6Mn4kX1f2a5nruNjmV+Th32sugE8zwz8=

- -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=

- -golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 h1:a4tQYYYuK9QdeO/+kEvNYyuR21S+7ve5EANok6hABhI=

- -golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

- -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495 h1:I6A9Ag9FpEKOjcKrRNjQkPHawoXIhKyTGfvvjFAiiAk=

- -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

- -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=

- -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 h1:rJm0LuqUjoDhSk2zO9ISMSToQxGz7Os2jRiOL8AWu4c=

- -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

- -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=

- -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=

- -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

- -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=

- -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

- -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=

- -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

- -golang.org/x/sys v0.0.0-20190209173611-3b5209105503 h1:5SvYFrOM3W8Mexn9/oA44Ji7vhXAZQ9hiP+1Q/DMrWg=

- -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

- -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU=

- -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

- -golang.org/x/time v0.0.0-20161028155119-f51c12702a4d h1:TnM+PKb3ylGmZvyPXmo9m/wktg7Jn/a/fNmr33HSj8g=

- -golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

- -golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 h1:7Pf/N3ln54fsGsAPsSwSfFhxXGKWHMIRUI/T5x1GP90=

- -golang.org/x/tools v0.0.0-20190313210603-aa82965741a9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

- -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw=

- -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=

- -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts=

- -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=

- -google.golang.org/api v0.0.0-20181220000619-583d854617af h1:iQMS7JKv/0w/iiWf1M49Cg3dmOkBoBZT5KheqPDpaac=

- -google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=

- -google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=

- -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

- -google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 h1:72GtwBPfq6av9X0Ru2HtAopsPW+d+vh1K1zaxanTdE8=

- -google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

- -google.golang.org/grpc v1.13.0 h1:bHIbVsCwmvbArgCJmLdgOdHFXlKqTOVjbibbS19cXHc=

- -google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

- -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

- -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

- -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

- -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

- -gopkg.in/gcfg.v1 v1.2.0 h1:0HIbH907iBTAntm+88IJV2qmJALDAh8sPekI9Vc1fm0=

- -gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=

- -gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o=

- -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=

- -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7 h1:986b60BAz5vO2Vaf48yQaq+wb2bU4JsXxKu1+itW6x8=

- -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=

- -gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84 h1:ELQJ5WuT+ydETLCpWvAuw8iGBQRGoJq+A3RAbbAcZUY=

- -gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=

- -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=

- -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

- -gopkg.in/warnings.v0 v0.1.1 h1:XM28wIgFzaBmeZ5dNHIpWLQpt/9DGKxk+rCg/22nnYE=

- -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

- -gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=

- -gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=

- -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=

- -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

- -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=

- -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=

- -k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=

- -k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

- -k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=

- -k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=

- -k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=

- -k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

- -k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

- -k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=

- -k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 h1:WD6cPA3q7qxZe6Fwir0XjjGwGMaWbHlHUcjCcOzuRG0=

- -k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ=

- -k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=

- -k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=

- -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=

- -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=

- -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

- -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=

- -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=

- -sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

- -sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=

- -sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 h1:9r5DY45ef9LtcA6BnkhW8MPV7OKAfbf2AUwUhq3LeRk=

- -sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

- -sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=

- -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

- -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=

- -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=

- -- 

- 2.7.5

- 

file added
+26
@@ -0,0 +1,26 @@ 

+ ###

+ # kubernetes system config

+ #

+ # The following values are used to configure the kube-apiserver

+ #

+ 

+ # The address on the local server to listen to.

+ KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1"

+ 

+ # The port on the local server to listen on.

+ # KUBE_API_PORT="--port=8080"

+ 

+ # Port minions listen on

+ # KUBELET_PORT="--kubelet-port=10250"

+ 

+ # Comma separated list of nodes in the etcd cluster

+ KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379,http://127.0.0.1:4001"

+ 

+ # Address range to use for services

+ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16"

+ 

+ # default admission control policies

+ KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"

+ 

+ # Add your own!

+ KUBE_API_ARGS=""

file added
+22
@@ -0,0 +1,22 @@ 

+ ###

+ # kubernetes system config

+ #

+ # The following values are used to configure various aspects of all

+ # kubernetes services, including

+ #

+ #   kube-apiserver.service

+ #   kube-controller-manager.service

+ #   kube-scheduler.service

+ #   kubelet.service

+ #   kube-proxy.service

+ # logging to stderr means we get it in the systemd journal

+ KUBE_LOGTOSTDERR="--logtostderr=true"

+ 

+ # journal message level, 0 is debug

+ KUBE_LOG_LEVEL="--v=0"

+ 

+ # Should this cluster be allowed to run privileged docker containers

+ KUBE_ALLOW_PRIV="--allow-privileged=false"

+ 

+ # How the controller-manager, scheduler, and proxy find the apiserver

+ KUBE_MASTER="--master=http://127.0.0.1:8080"

@@ -0,0 +1,7 @@ 

+ ###

+ # The following values are used to configure the kubernetes controller-manager

+ 

+ # defaults from config and apiserver should be adequate

+ 

+ # Add your own!

+ KUBE_CONTROLLER_MANAGER_ARGS=""

file added
+17
@@ -0,0 +1,17 @@ 

+ ###

+ # kubernetes kubelet (minion) config

+ 

+ # The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)

+ KUBELET_ADDRESS="--address=127.0.0.1"

+ 

+ # The port for the info server to serve on

+ # KUBELET_PORT="--port=10250"

+ 

+ # You may leave this blank to use the actual hostname

+ KUBELET_HOSTNAME="--hostname-override=127.0.0.1"

+ 

+ # Edit the kubelet.kubeconfig to have correct cluster server address

+ KUBELET_KUBECONFIG=/etc/kubernetes/kubelet.kubeconfig

+ 

+ # Add your own!

+ KUBELET_ARGS="--cgroup-driver=systemd --fail-swap-on=false"

@@ -0,0 +1,12 @@ 

+ apiVersion: v1

+ kind: Config

+ clusters:

+   - cluster:

+       server: http://127.0.0.1:8080/

+     name: local

+ contexts:

+   - context:

+       cluster: local

+     name: local

+ current-context: local

+ 

file added
+7
@@ -0,0 +1,7 @@ 

+ ###

+ # kubernetes proxy config

+ 

+ # default config should be adequate

+ 

+ # Add your own!

+ KUBE_PROXY_ARGS=""

file added
+7
@@ -0,0 +1,7 @@ 

+ ###

+ # kubernetes scheduler config

+ 

+ # default config should be adequate

+ 

+ # Add your own!

+ KUBE_SCHEDULER_ARGS=""

@@ -1,28 +0,0 @@ 

- From 73d74e6e9b886e4de2de24aa5edff248289771fe Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Thu, 13 Apr 2017 14:00:10 +0200

- Subject: [PATCH] fix rootScopeNaming generate selfLink issue #37686

- 

- ---

-  .../staging/src/k8s.io/apiserver/pkg/endpoints/installer.go          | 5 ++++-

-  1 file changed, 4 insertions(+), 1 deletion(-)

- 

- diff --git a/src/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go b/src/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go

- index c4d26d4..6755720 100644

- --- a/src/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go

- +++ b/src/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go

- @@ -850,7 +850,10 @@ func (n rootScopeNaming) GenerateLink(req *restful.Request, obj runtime.Object)

-  			return "", err

-  		}

-  	}

- -	return n.pathPrefix + url.QueryEscape(name) + n.pathSuffix, nil

- +	if len(n.pathSuffix) == 0 {

- +		return gpath.Join(n.pathPrefix, url.QueryEscape(name)), nil

- +	}

- +	return gpath.Join(n.pathPrefix, url.QueryEscape(name), n.pathSuffix), nil

-  }

-  

-  // GenerateListLink returns the appropriate path and query to locate a list by its canonical path.

- -- 

- 2.7.4

- 

@@ -1,53 +0,0 @@ 

- From 8585e6e6245a7e42e1ef767ea34d0bb08ca56e47 Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Mon, 17 Jul 2017 14:22:29 +0200

- Subject: [PATCH] fix support for ppc64le

- 

- ---

-  src/k8s.io/kubernetes/build/root/Makefile | 2 +-

-  src/k8s.io/kubernetes/hack/lib/init.sh    | 2 +-

-  src/k8s.io/kubernetes/hack/lib/util.sh    | 2 +-

-  3 files changed, 3 insertions(+), 3 deletions(-)

- 

- diff --git a/src/k8s.io/kubernetes/build/root/Makefile b/src/k8s.io/kubernetes/build/root/Makefile

- index ea5eec8..5a88385 100644

- --- a/src/k8s.io/kubernetes/build/root/Makefile

- +++ b/src/k8s.io/kubernetes/build/root/Makefile

- @@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules

-  # Constants used throughout.

-  .EXPORT_ALL_VARIABLES:

-  OUT_DIR ?= _output

- -BIN_DIR := $(OUT_DIR)/bin

- +BIN_DIR := $(OUT_DIR)/local/go/bin

-  PRJ_SRC_PATH := k8s.io/kubernetes

-  GENERATED_FILE_PREFIX := zz_generated.

-  

- diff --git a/src/k8s.io/kubernetes/hack/lib/init.sh b/src/k8s.io/kubernetes/hack/lib/init.sh

- index 02aba9e..a53f326 100755

- --- a/src/k8s.io/kubernetes/hack/lib/init.sh

- +++ b/src/k8s.io/kubernetes/hack/lib/init.sh

- @@ -45,7 +45,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"

-  source "${KUBE_ROOT}/hack/lib/golang.sh"

-  source "${KUBE_ROOT}/hack/lib/etcd.sh"

-  

- -KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"

- +KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/usr/bin"

-  

-  # list of all available group versions.  This should be used when generated code

-  # or when starting an API server that you want to have everything.

- diff --git a/src/k8s.io/kubernetes/hack/lib/util.sh b/src/k8s.io/kubernetes/hack/lib/util.sh

- index 50f6b55..c8a8b5e 100755

- --- a/src/k8s.io/kubernetes/hack/lib/util.sh

- +++ b/src/k8s.io/kubernetes/hack/lib/util.sh

- @@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() {

-    local -r lookfor="$1"

-    local -r platform="$2"

-    local locations=(

- -    "${KUBE_ROOT}/_output/bin/${lookfor}"

- +    "${KUBE_ROOT}/_output/local/go/bin/${lookfor}"

-      "${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}"

-      "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"

-      "${KUBE_ROOT}/platforms/${platform}/${lookfor}"

- -- 

- 2.7.5

- 

file removed
-37
@@ -1,37 +0,0 @@ 

- # 1. create symlink to openshift binary in the local directory

- # 2. set envs

- # 3. run tests

- 

- ########################

- # SYMLINKS             #

- ########################

- 

- # run it in a directory of extracted kubernetes-master and kubernetes-unit-tests rpms

- # or redine the following envs

- export OC_BIN_PATH=${OC_BIN_PATH:-./usr/bin/openshift}

- export K8S_HACK_DIR=${K8S_HACK_DIR:-./var/lib/kubernetes-unit-test}

- 

- #o#######################

- # SYMLINKS             #

- ########################

- # recreate symlink to kubectl

- for binary in kubectl kubelet kube-proxy kube-controller-manager kube-scheduler kube-apiserver; do

-         rm -f ./${binary}

-         ln -s ${OC_BIN_PATH} ${binary}

- done

- 

- ########################

- # ENVS                 #

- ########################

- 

- 

- ########################

- # TESTS                #

- ########################

- TEST_DIRECTORY=$(pwd)

- pushd ${K8S_HACK_DIR}

- 

- export KUBE_OUTPUT_HOSTBIN=${KUBE_OUTPUT_HOSTBIN:-${TEST_DIRECTORY}}

- ./hack/test-cmd.sh

- 

- popd

@@ -0,0 +1,27 @@ 

+ [Unit]

+ Description=Kubernetes API Server

+ Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-apiserver https://kubernetes.io/docs/reference/generated/kube-apiserver/

+ After=network.target

+ After=etcd.service

+ 

+ [Service]

+ EnvironmentFile=-/etc/kubernetes/config

+ EnvironmentFile=-/etc/kubernetes/apiserver

+ User=kube

+ ExecStart=/usr/bin/kube-apiserver \

+ 	    $KUBE_LOGTOSTDERR \

+ 	    $KUBE_LOG_LEVEL \

+ 	    $KUBE_ETCD_SERVERS \

+ 	    $KUBE_API_ADDRESS \

+ 	    $KUBE_API_PORT \

+ 	    $KUBELET_PORT \

+ 	    $KUBE_ALLOW_PRIV \

+ 	    $KUBE_SERVICE_ADDRESSES \

+ 	    $KUBE_ADMISSION_CONTROL \

+ 	    $KUBE_API_ARGS

+ Restart=on-failure

+ Type=notify

+ LimitNOFILE=65536

+ 

+ [Install]

+ WantedBy=multi-user.target

@@ -0,0 +1,18 @@ 

+ [Unit]

+ Description=Kubernetes Controller Manager

+ Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-controller-manager https://kubernetes.io/docs/reference/generated/kube-controller-manager/

+ 

+ [Service]

+ EnvironmentFile=-/etc/kubernetes/config

+ EnvironmentFile=-/etc/kubernetes/controller-manager

+ User=kube

+ ExecStart=/usr/bin/kube-controller-manager \

+ 	    $KUBE_LOGTOSTDERR \

+ 	    $KUBE_LOG_LEVEL \

+ 	    $KUBE_MASTER \

+ 	    $KUBE_CONTROLLER_MANAGER_ARGS

+ Restart=on-failure

+ LimitNOFILE=65536

+ 

+ [Install]

+ WantedBy=multi-user.target

file added
+18
@@ -0,0 +1,18 @@ 

+ [Unit]

+ Description=Kubernetes Kube-Proxy Server

+ Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-proxy https://kubernetes.io/docs/reference/generated/kube-proxy/

+ After=network.target

+ 

+ [Service]

+ EnvironmentFile=-/etc/kubernetes/config

+ EnvironmentFile=-/etc/kubernetes/proxy

+ ExecStart=/usr/bin/kube-proxy \

+ 	    $KUBE_LOGTOSTDERR \

+ 	    $KUBE_LOG_LEVEL \

+ 	    $KUBE_MASTER \

+ 	    $KUBE_PROXY_ARGS

+ Restart=on-failure

+ LimitNOFILE=65536

+ 

+ [Install]

+ WantedBy=multi-user.target

@@ -0,0 +1,18 @@ 

+ [Unit]

+ Description=Kubernetes Scheduler Plugin

+ Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-scheduler https://kubernetes.io/docs/reference/generated/kube-scheduler/

+ 

+ [Service]

+ EnvironmentFile=-/etc/kubernetes/config

+ EnvironmentFile=-/etc/kubernetes/scheduler

+ User=kube

+ ExecStart=/usr/bin/kube-scheduler \

+ 	    $KUBE_LOGTOSTDERR \

+ 	    $KUBE_LOG_LEVEL \

+ 	    $KUBE_MASTER \

+ 	    $KUBE_SCHEDULER_ARGS

+ Restart=on-failure

+ LimitNOFILE=65536

+ 

+ [Install]

+ WantedBy=multi-user.target

file modified
+3 -1
@@ -1,12 +1,14 @@ 

  [Service]

  Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false"

- Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true"

+ Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests"

  Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/usr/libexec/cni"

  Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"

  Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"

  Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd"

+ 

  ExecStart=

  ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS

+ 

  Restart=always

  StartLimitInterval=0

  RestartSec=10

file added
+23
@@ -0,0 +1,23 @@ 

+ [Unit]

+ Description=Kubernetes Kubelet Server

+ Documentation=https://kubernetes.io/docs/concepts/overview/components/#kubelet https://kubernetes.io/docs/reference/generated/kubelet/

+ After=docker.service crio.service

+ 

+ [Service]

+ WorkingDirectory=/var/lib/kubelet

+ EnvironmentFile=-/etc/kubernetes/config

+ EnvironmentFile=-/etc/kubernetes/kubelet

+ ExecStart=/usr/bin/kubelet \

+ 	    $KUBE_LOGTOSTDERR \

+ 	    $KUBE_LOG_LEVEL \

+ 	    $KUBELET_KUBECONFIG \

+ 	    $KUBELET_ADDRESS \

+ 	    $KUBELET_PORT \

+ 	    $KUBELET_HOSTNAME \

+ 	    $KUBE_ALLOW_PRIV \

+ 	    $KUBELET_ARGS

+ Restart=on-failure

+ KillMode=process

+ 

+ [Install]

+ WantedBy=multi-user.target

file modified
+1 -2
@@ -1,4 +1,3 @@ 

  [Manager]

  DefaultCPUAccounting=yes

- DefaultMemoryAccounting=yes  

- 

+ DefaultMemoryAccounting=yes

file added
+1
@@ -0,0 +1,1 @@ 

+ d /var/run/kubernetes 0755 kube kube -

file modified
+76 -80
@@ -15,47 +15,42 @@ 

  

  %global provider_prefix         %{provider}.%{provider_tld}/%{project}/%{repo}

  %global import_path             k8s.io/kubernetes

- %global commit                  6c143d35bb11d74970e7bc0b6c45b6bfdffc0bd4

+ %global commit                  52c56ce7a8272c798dbc29846288d7cd9fbae032

  %global shortcommit              %(c=%{commit}; echo ${c:0:7})

  

- %global con_provider            github

- %global con_provider_tld        com

- %global con_project             kubernetes

- %global con_repo                contrib

- # https://github.com/kubernetes/contrib

- %global con_provider_prefix     %{con_provider}.%{con_provider_tld}/%{con_project}/%{con_repo}

- %global con_commit              5b445f1c53aa8d6457523526340077935f62e691

- %global con_shortcommit         %(c=%{con_commit}; echo ${c:0:7})

- 

  # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work

  %global _buildshell  /bin/bash

  %global _checkshell  /bin/bash

  

  ##############################################

  Name:           kubernetes

- Version:        1.15.7

- Release:        2%{?dist}

+ Version:        1.18.2

+ Release:        1%{?dist}

  Summary:        Container cluster management

  License:        ASL 2.0

  URL:            https://%{import_path}

  ExclusiveArch:  x86_64 aarch64 ppc64le s390x %{arm}

  Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz

- Source1:        https://%{con_provider_prefix}/archive/%{con_commit}/%{con_repo}-%{con_shortcommit}.tar.gz

- Source3:        kubernetes-accounting.conf

- Source4:        kubeadm.conf

  

- Source33:       genmanpages.sh

+ Source101:      kube-proxy.service

+ Source102:      kube-apiserver.service

+ Source103:      kube-scheduler.service

+ Source104:      kube-controller-manager.service

+ Source105:      kubelet.service

+ Source106:      environ-apiserver

+ Source107:      environ-config

+ Source108:      environ-controller-manager

+ Source109:      environ-kubelet

+ Source110:      environ-kubelet.kubeconfig

+ Source111:      environ-proxy

+ Source112:      environ-scheduler

+ Source113:      kubernetes-accounting.conf

+ Source114:      kubeadm.conf

+ Source115:      kubernetes.conf

+ 

+ Source200:      genmanpages.sh

  

  Patch3:         build-with-debug-info.patch

- #Patch4:         make-test-cmd-run-over-hyperkube-based-kubectl.patch

- #Patch5:         make-e2e_node-run-over-distro-bins.patch

- 

- # ppc64le

- Patch16:        fix-support-for-ppc64le.patch

- 

- # CVE-2019-11250 kubernetes: Bearer tokens written to logs at high verbosity levels (>= 7)

- Patch17:        Hide-bearer-token-in-logs-upstream-81330.patch

- Patch18:        Remove-go-mod.patch

  

  # It obsoletes cadvisor but needs its source code (literally integrated)

  Obsoletes:      cadvisor
@@ -136,19 +131,16 @@ 

  ##############################################

  

  %prep

- %setup -q -n %{con_repo}-%{con_commit} -T -b 1

  %setup -q -n %{repo}-%{commit}

  

  %if 0%{?with_debug}

  %patch3 -p1

  %endif

  

- # copy contrib folder

- mkdir contrib

- cp -r ../%{con_repo}-%{con_commit}/init contrib/.

- 

- #src/k8s.io/kubernetes/pkg/util/certificates

+ # src/k8s.io/kubernetes/pkg/util/certificates

  # Patch the code to remove eliptic.P224 support

+ # For whatever reason:

+ # https://groups.google.com/forum/#!topic/Golang-nuts/Oq4rouLEvrU

  for dir in vendor/github.com/google/certificate-transparency/go/x509 pkg/util/certificates; do

    if [ -d "${dir}" ]; then

      pushd ${dir}
@@ -161,13 +153,6 @@ 

  mkdir -p src/k8s.io/kubernetes

  mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.

  

- %ifarch ppc64le

- %patch16 -p1

- %endif

- 

- %patch17 -p1

- %patch18 -p1

- 

  ###############

  

  %build
@@ -177,16 +162,15 @@ 

  export KUBE_GIT_VERSION=v{version}

  export KUBE_EXTRA_GOPATH=$(pwd)/Godeps/_workspace

  

- # https://bugzilla.redhat.com/show_bug.cgi?id=1392922#c1

- %ifarch ppc64le

- export GOLDFLAGS='-linkmode=external'

- %endif

  # Build each binary separately to generate a unique build-id.

- # Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/kubernetes-1.13.5-1.fc31.x86_64/usr/bin/kube-apiserver and /builddir/build/BUILDROOT/kubernetes-1.13.5-1.fc31.x86_64/usr/bin/kubeadm

- make WHAT="cmd/hyperkube"

+ # Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/.../usr/bin/kube-apiserver and /builddir/build/BUILDROOT/.../usr/bin/kubeadm

+ make WHAT="cmd/kube-proxy"

  make WHAT="cmd/kube-apiserver"

+ make WHAT="cmd/kube-controller-manager"

+ make WHAT="cmd/kubelet"

  make WHAT="cmd/kubeadm"

- 

+ make WHAT="cmd/kube-scheduler"

+ make WHAT="cmd/kubectl"

  

  # convert md to man

  ./hack/generate-docs.sh || true
@@ -194,7 +178,7 @@ 

  pushd admin

  cp kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md ..

  popd

- cp %{SOURCE33} genmanpages.sh

+ cp %{SOURCE200} genmanpages.sh

  bash genmanpages.sh

  popd

  popd
@@ -211,56 +195,63 @@ 

  output_path="${KUBE_OUTPUT_BINPATH}/$(kube::golang::host_platform)"

  %endif

  

+ echo "+++ INSTALLING binaries"

  install -m 755 -d %{buildroot}%{_bindir}

- 

- echo "+++ INSTALLING hyperkube"

- install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/hyperkube

- 

- echo "+++ INSTALLING kube-apiserver"

- install -p -m 754 -t %{buildroot}%{_bindir} ${output_path}/kube-apiserver

- 

- echo "+++ INSTALLING kubeadm"

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kube-proxy

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kube-apiserver

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kube-controller-manager

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubelet

  install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubeadm

- install -d -m 0755 %{buildroot}/%{_sysconfdir}/systemd/system/kubelet.service.d

- install -p -m 0644 -t %{buildroot}/%{_sysconfdir}/systemd/system/kubelet.service.d %{SOURCE4}

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kube-scheduler

+ install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubectl

  

- binaries=(kube-controller-manager kube-scheduler kube-proxy kubelet kubectl)

- for bin in "${binaries[@]}"; do

-   echo "+++ HARDLINKING ${bin} to hyperkube"

-   ln %{buildroot}%{_bindir}/hyperkube %{buildroot}%{_bindir}/${bin}

- done

+ echo "+++ INSTALLING kubelet service config"

+ install -d -m 0755 %{buildroot}/%{_sysconfdir}/systemd/system/kubelet.service.d

+ install -p -m 0644 -t %{buildroot}/%{_sysconfdir}/systemd/system/kubelet.service.d %{SOURCE114}

  

- # install the bash completion

+ echo "+++ INSTALLING bash completion"

  install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/

  %{buildroot}%{_bindir}/kubectl completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl

  

- # install config files

+ echo "+++ INSTALLING config files"

+ %define remove_environ_prefix() %(echo -n %1|sed 's/.*environ-//g')

  install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}

- install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} contrib/init/systemd/environ/*

+ install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/manifests

+ install -m 644 -T %{SOURCE106} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE106}}

+ install -m 644 -T %{SOURCE107} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE107}}

+ install -m 644 -T %{SOURCE108} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE108}}

+ install -m 644 -T %{SOURCE109} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE109}}

+ install -m 644 -T %{SOURCE110} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE110}}

+ install -m 644 -T %{SOURCE111} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE111}}

+ install -m 644 -T %{SOURCE112} %{buildroot}%{_sysconfdir}/%{name}/%{remove_environ_prefix %{SOURCE112}}

+ 

+ # place systemd/tmpfiles.d/kubernetes.conf to /usr/lib/tmpfiles.d/kubernetes.conf

+ install -d -m 0755 %{buildroot}%{_tmpfilesdir}

+ install -p -m 0644 -t %{buildroot}/%{_tmpfilesdir} %{SOURCE115}

+ 

+ # enable CPU and Memory accounting

+ install -d -m 0755 %{buildroot}/%{_sysconfdir}/systemd/system.conf.d

+ install -p -m 0644 -t %{buildroot}/%{_sysconfdir}/systemd/system.conf.d %{SOURCE113}

  

- # install service files

+ echo "+++ INSTALLING service files"

  install -d -m 0755 %{buildroot}%{_unitdir}

- install -m 0644 -t %{buildroot}%{_unitdir} contrib/init/systemd/*.service

+ install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE101}

+ install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE102}

+ install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE103}

+ install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE104}

+ install -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE105}

  

- # install manpages

+ echo "+++ INSTALLING manpages"

  install -d %{buildroot}%{_mandir}/man1

- install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1

- rm %{buildroot}%{_mandir}/man1/cloud-controller-manager.*

  # from k8s tarball copied docs/man/man1/*.1

+ install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1

  

- # install the place the kubelet defaults to put volumes

+ # install the place the kubelet defaults to put volumes and default folder structure

  install -d %{buildroot}%{_sharedstatedir}/kubelet

  

- # place contrib/init/systemd/tmpfiles.d/kubernetes.conf to /usr/lib/tmpfiles.d/kubernetes.conf

- install -d -m 0755 %{buildroot}%{_tmpfilesdir}

- install -p -m 0644 -t %{buildroot}/%{_tmpfilesdir} contrib/init/systemd/tmpfiles.d/kubernetes.conf

  mkdir -p %{buildroot}/run

  install -d -m 0755 %{buildroot}/run/%{name}/

  

- # enable CPU and Memory accounting

- install -d -m 0755 %{buildroot}/%{_sysconfdir}/systemd/system.conf.d

- install -p -m 0644 -t %{buildroot}/%{_sysconfdir}/systemd/system.conf.d %{SOURCE3}

- 

  popd

  

  mv src/k8s.io/kubernetes/*.md .
@@ -294,7 +285,6 @@ 

  %attr(754, -, kube) %caps(cap_net_bind_service=ep) %{_bindir}/kube-apiserver

  %{_bindir}/kube-controller-manager

  %{_bindir}/kube-scheduler

- %{_bindir}/hyperkube

  %{_unitdir}/kube-apiserver.service

  %{_unitdir}/kube-controller-manager.service

  %{_unitdir}/kube-scheduler.service
@@ -314,14 +304,15 @@ 

  %{_mandir}/man1/kube-proxy.1*

  %{_bindir}/kubelet

  %{_bindir}/kube-proxy

- %{_bindir}/hyperkube

  %{_unitdir}/kube-proxy.service

  %{_unitdir}/kubelet.service

  %dir %{_sharedstatedir}/kubelet

  %dir %{_sysconfdir}/%{name}

+ %dir %{_sysconfdir}/%{name}/manifests

  %config(noreplace) %{_sysconfdir}/%{name}/config

  %config(noreplace) %{_sysconfdir}/%{name}/kubelet

  %config(noreplace) %{_sysconfdir}/%{name}/proxy

+ %config(noreplace) %{_sysconfdir}/%{name}/kubelet.kubeconfig

  %config(noreplace) %{_sysconfdir}/systemd/system.conf.d/kubernetes-accounting.conf

  %{_tmpfilesdir}/kubernetes.conf

  %verify(not size mtime md5) %attr(755, kube,kube) %dir /run/%{name}
@@ -343,7 +334,6 @@ 

  %{_mandir}/man1/kubectl.1*

  %{_mandir}/man1/kubectl-*

  %{_bindir}/kubectl

- %{_bindir}/hyperkube

  %{_datadir}/bash-completion/completions/kubectl

  

  ##############################################
@@ -383,6 +373,12 @@ 

  

  ############################################

  %changelog

+ * Fri May 15 2020 Kairui Song <ryncsn@gmail.com> - 1.18.2-1

+ - Update to v1.18.2

+ - Update service file and config file

+ - "contrib" is EOL, move files into this repo

+ - Update the build steps to fit latest upstream

+ 

  * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.7-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

@@ -1,80 +0,0 @@ 

- From 43f9b66744362240332241788d9811f863366f4e Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Thu, 5 Jan 2017 10:01:34 +0100

- Subject: [PATCH] make e2e_node run over distro bins

- 

- ---

-  src/k8s.io/kubernetes/hack/lib/init.sh                   | 2 +-

-  src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh   | 2 +-

-  src/k8s.io/kubernetes/test/e2e_node/builder/build.go     | 6 +++++-

-  src/k8s.io/kubernetes/test/e2e_node/services/services.go | 5 +++++

-  4 files changed, 12 insertions(+), 3 deletions(-)

- 

- diff --git a/src/k8s.io/kubernetes/hack/lib/init.sh b/src/k8s.io/kubernetes/hack/lib/init.sh

- index ae50779..0a601ac 100644

- --- a/src/k8s.io/kubernetes/hack/lib/init.sh

- +++ b/src/k8s.io/kubernetes/hack/lib/init.sh

- @@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"

-  source "${KUBE_ROOT}/hack/lib/golang.sh"

-  source "${KUBE_ROOT}/hack/lib/etcd.sh"

-  

- -KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"

- +KUBE_OUTPUT_HOSTBIN="/usr/bin"

-  

-  # list of all available group versions.  This should be used when generated code

-  # or when starting an API server that you want to have everything.

- diff --git a/src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh b/src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh

- index e98842d..3d51a06 100755

- --- a/src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh

- +++ b/src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh

- @@ -148,6 +148,6 @@ else

-    # Provided for backwards compatibility

-    go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \

-      --test-flags="--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \

- -    $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"

- +    $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"

-    exit $?

-  fi

- diff --git a/src/k8s.io/kubernetes/test/e2e_node/builder/build.go b/src/k8s.io/kubernetes/test/e2e_node/builder/build.go

- index f22232a..c49c35f 100644

- --- a/src/k8s.io/kubernetes/test/e2e_node/builder/build.go

- +++ b/src/k8s.io/kubernetes/test/e2e_node/builder/build.go

- @@ -31,7 +31,7 @@ import (

-  var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet binaries.")

-  

-  var buildTargets = []string{

- -	"cmd/kubelet",

- +	//"cmd/kubelet",

-  	"test/e2e_node/e2e_node.test",

-  	"vendor/github.com/onsi/ginkgo/ginkgo",

-  }

- @@ -53,6 +53,10 @@ func BuildGo() error {

-  	return nil

-  }

-  

- +func GetK8sBinDir() string {

- +       return *k8sBinDir

- +}

- +

-  func getK8sBin(bin string) (string, error) {

-  	// Use commandline specified path

-  	if *k8sBinDir != "" {

- diff --git a/src/k8s.io/kubernetes/test/e2e_node/services/services.go b/src/k8s.io/kubernetes/test/e2e_node/services/services.go

- index ae73721..b243168 100644

- --- a/src/k8s.io/kubernetes/test/e2e_node/services/services.go

- +++ b/src/k8s.io/kubernetes/test/e2e_node/services/services.go

- @@ -141,6 +141,11 @@ func (e *E2EServices) startInternalServices() (*server, error) {

-  	}

-  	// Pass all flags into the child process, so that it will see the same flag set.

-  	startCmd := exec.Command(testBin, append([]string{"--run-services-mode"}, os.Args[1:]...)...)

- +

- +	if build.GetK8sBinDir() != "" {

- +		startCmd.Args = append(startCmd.Args, fmt.Sprintf("--k8s-bin-dir=%v", build.GetK8sBinDir()))

- +	}

- +

-  	server := newServer("services", startCmd, nil, nil, getServicesHealthCheckURLs(), servicesLogFile, e.monitorParent, false)

-  	return server, server.start()

-  }

- -- 

- 2.7.4

- 

@@ -1,67 +0,0 @@ 

- From 40fda813b0c33faa060f44dd2b078b8a8674b793 Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Mon, 14 Nov 2016 12:02:27 +0100

- Subject: [PATCH] make test-cmd run over hyperkube based kubectl

- 

- ---

-  src/k8s.io/kubernetes/hack/lib/test.sh            |  3 ++-

-  src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh | 14 +-------------

-  2 files changed, 3 insertions(+), 14 deletions(-)

- 

- diff --git a/src/k8s.io/kubernetes/hack/lib/test.sh b/src/k8s.io/kubernetes/hack/lib/test.sh

- index 00f7ceb..26d9d85 100644

- --- a/src/k8s.io/kubernetes/hack/lib/test.sh

- +++ b/src/k8s.io/kubernetes/hack/lib/test.sh

- @@ -33,8 +33,9 @@ kube::test::get_object_assert() {

-    local request=$2

-    local expected=$3

-    local args=${4:-}

- +  local get_args=${5:-}

-  

- -  res=$(eval kubectl ${args} get "${kube_flags[@]}" $object -o go-template=\"$request\")

- +  res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} $object -o go-template=\"$request\")

-  

-    if [[ "$res" =~ ^$expected$ ]]; then

-        echo -n ${green}

- diff --git a/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh b/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh

- index e77b06d..b1cc52e 100755

- --- a/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh

- +++ b/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh

- @@ -147,13 +147,6 @@ function wait-for-pods-with-label()

-  kube::util::trap_add cleanup EXIT SIGINT

-  kube::util::ensure-temp-dir

-  

- -BINS=(

- -	cmd/kubectl

- -	cmd/kube-apiserver

- -	cmd/kube-controller-manager

- -)

- -make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"

- -

-  kube::etcd::start

-  

-  ETCD_HOST=${ETCD_HOST:-127.0.0.1}

- @@ -190,11 +183,6 @@ kube::log::status "Running kubectl with no options"

-  # Only run kubelet on platforms it supports

-  if [[ "$(go env GOHOSTOS)" == "linux" ]]; then

-  

- -BINS=(

- -	cmd/kubelet

- -)

- -make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"

- -

-  kube::log::status "Starting kubelet in masterless mode"

-  "${KUBE_OUTPUT_HOSTBIN}/kubelet" \

-    --really-crash-for-testing=true \

- @@ -456,7 +444,7 @@ runTests() {

-    # Describe command should print events information when show-events=true

-    kube::test::describe_resource_events_assert pods true

-    ### Validate Export ###

- -  kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" '<no value> valid-pod' "--export=true"

- +  kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" '<no value> valid-pod' "" "--export=true"

-  

-    ### Dump current valid-pod POD

-    output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1 "${kube_flags[@]}")

- -- 

- 1.9.3

- 

@@ -1,120 +0,0 @@ 

- From 2f2a5c866d6b2bbe720972d8b11fa8055c1aba0c Mon Sep 17 00:00:00 2001

- From: Jan Chaloupka <jchaloup@redhat.com>

- Date: Mon, 2 Oct 2017 14:20:15 +0200

- Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube, remove

-  federation cmds

- 

- ---

-  cmd/hyperkube/federation-apiserver.go          | 39 --------------------------

-  cmd/hyperkube/federation-controller-manager.go | 38 -------------------------

-  cmd/hyperkube/main.go                          |  4 ---

-  3 files changed, 81 deletions(-)

-  delete mode 100644 cmd/hyperkube/federation-apiserver.go

-  delete mode 100644 cmd/hyperkube/federation-controller-manager.go

- 

- diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go

- deleted file mode 100644

- index 97dff04..0000000

- --- a/cmd/hyperkube/federation-apiserver.go

- +++ /dev/null

- @@ -1,39 +0,0 @@

- -/*

- -Copyright 2016 The Kubernetes Authors.

- -

- -Licensed under the Apache License, Version 2.0 (the "License");

- -you may not use this file except in compliance with the License.

- -You may obtain a copy of the License at

- -

- -    http://www.apache.org/licenses/LICENSE-2.0

- -

- -Unless required by applicable law or agreed to in writing, software

- -distributed under the License is distributed on an "AS IS" BASIS,

- -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- -See the License for the specific language governing permissions and

- -limitations under the License.

- -*/

- -

- -package main

- -

- -import (

- -	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"

- -	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"

- -)

- -

- -// NewFederationAPIServer creates a new hyperkube Server object that includes the

- -// description and flags.

- -func NewFederationAPIServer() *Server {

- -	s := options.NewServerRunOptions()

- -

- -	hks := Server{

- -		SimpleUsage: "federation-apiserver",

- -		Long:        "The API entrypoint for the federation control plane",

- -		Run: func(_ *Server, args []string, stopCh <-chan struct{}) error {

- -			return app.Run(s, stopCh)

- -		},

- -		RespectsStopCh: true,

- -	}

- -	s.AddFlags(hks.Flags())

- -	return &hks

- -}

- diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go

- deleted file mode 100644

- index b702a1e..0000000

- --- a/cmd/hyperkube/federation-controller-manager.go

- +++ /dev/null

- @@ -1,38 +0,0 @@

- -/*

- -Copyright 2016 The Kubernetes Authors.

- -

- -Licensed under the Apache License, Version 2.0 (the "License");

- -you may not use this file except in compliance with the License.

- -You may obtain a copy of the License at

- -

- -    http://www.apache.org/licenses/LICENSE-2.0

- -

- -Unless required by applicable law or agreed to in writing, software

- -distributed under the License is distributed on an "AS IS" BASIS,

- -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- -See the License for the specific language governing permissions and

- -limitations under the License.

- -*/

- -

- -package main

- -

- -import (

- -	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"

- -	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"

- -)

- -

- -// NewFederationCMServer creates a new hyperkube Server object that includes the

- -// description and flags.

- -func NewFederationCMServer() *Server {

- -	s := options.NewCMServer()

- -

- -	hks := Server{

- -		SimpleUsage: "federation-controller-manager",

- -		Long:        "Controller manager for federation control plane. Manages federation service endpoints and controllers",

- -		Run: func(_ *Server, args []string, stopCh <-chan struct{}) error {

- -			return app.Run(s)

- -		},

- -	}

- -	s.AddFlags(hks.Flags())

- -	return &hks

- -}

- diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go

- index ef49d06..de5b58f 100644

- --- a/cmd/hyperkube/main.go

- +++ b/cmd/hyperkube/main.go

- @@ -46,9 +46,5 @@ func main() {

-  	hk.AddServer(NewKubeProxy())

-  	hk.AddServer(NewKubeAggregator())

-  

- -	//Federation servers

- -	hk.AddServer(NewFederationAPIServer())

- -	hk.AddServer(NewFederationCMServer())

- -

-  	hk.RunToExit(os.Args)

-  }

- -- 

- 2.7.5

- 

file modified
+1 -2
@@ -1,2 +1,1 @@ 

- SHA512 (contrib-5b445f1.tar.gz) = 14680c3ddd3108127f9ee368c5e51f000ba5813b054275f3d5c3a66b9da20526642f268424d12aa78b18ada84cd8d87c7bd0ae0d550ee8e9fb6a5c683a4a233f

- SHA512 (kubernetes-6c143d3.tar.gz) = 9b8198c74f06442de7323db47c3f7d1a9e1364f05bd9417236e30eeb3fe1366855a92019a8d7e06900db71a17fb530c8916e19c007245f700b0cc0c044d704a4

+ SHA512 (kubernetes-52c56ce.tar.gz) = 2edf83e29945f3ace432b1879adf469ac4fee08c3eeac47a3ed8669061a7ce49757b56d44afc18e558c963f626f08a7ae009cefc5fb61482f381078a65b3d408

The dist-git cache tarballs is not included in the pull request, need to download them and upload them manually before build.

Hi thank you for your contrib, as no one is working on K8S stand alone package right now.

Can you squash your commits? And add your own changelog entry?
Also what's preventing you from uploading to dist-git?

Metadata Update from @jchaloup:
- Request assigned

4 years ago

Metadata Update from @jchaloup:
- Request assigned

4 years ago

ad removing contrib tarball: even though kubernetes/contrib is read-only repo, it's still valid to pick all the service and config files from the tarball. The idea was to minimize what we ship alongside the spec file. Unless you have a serious reason, please keep it as it is. In case you have to change some lines, use a patch instead. In case too many bits need to be changed, feel free to copy paste relevant files (as it is now) and make the changes in-situ.

ad removing hyperkube binary: please don't. Hyperkube binary carries all relevant binaries (e.g. kube-proxy, kube-controller-manager, kubelet, ...) as a single binary for minimizing memory requirements of containerized kubernetes image. Without hyperkube, size of the image will increase significantly.

ad removing patches:
- make-e2e_node-run-over-distro-bins.patch: ok to drop, it was purely for testing purposes
- make-test-cmd-run-over-hyperkube-based-kubectl.patch: this one is tricky, we need it so kube-apiserver can't be run through hyperkube. kube-apiserver requires additional capabilities (e.g. for opening privileged port).
- fix-support-for-ppc64le.patch: unless I am mistaken, ppc64le is still one of supported architectures, unless upstream updated their scripts, we still need the patch
- Hide-bearer-token-in-logs-upstream-81330.patch: ok to drop (it's already part of 1.18)
- Remove-go-mod.patch: feel free to drop if make WHAT=... works without it

Feel free to ask any question

ad removing contrib tarball: even though kubernetes/contrib is read-only repo, it's still valid to pick all the service and config files from the tarball. The idea was to minimize what we ship alongside the spec file. Unless you have a serious reason, please keep it as it is. In case you have to change some lines, use a patch instead. In case too many bits need to be changed, feel free to copy paste relevant files (as it is now) and make the changes in-situ.
ad removing hyperkube binary: please don't. Hyperkube binary carries all relevant binaries (e.g. kube-proxy, kube-controller-manager, kubelet, ...) as a single binary for minimizing memory requirements of containerized kubernetes image. Without hyperkube, size of the image will increase significantly.
ad removing patches:
- make-e2e_node-run-over-distro-bins.patch: ok to drop, it was purely for testing purposes
- make-test-cmd-run-over-hyperkube-based-kubectl.patch: this one is tricky, we need it so kube-apiserver can't be run through hyperkube. kube-apiserver requires additional capabilities (e.g. for opening privileged port).
- fix-support-for-ppc64le.patch: unless I am mistaken, ppc64le is still one of supported architectures, unless upstream updated their scripts, we still need the patch

It seems that it is no longer needed, just tested build of kube with this PR applied on ppc64le. Seems that the build script is fixed. But the dropped patch is not removed. @kasong please delete also the patch file, fix-support-for-ppc64le.patch.

  • Hide-bearer-token-in-logs-upstream-81330.patch: ok to drop (it's already part of 1.18)
  • Remove-go-mod.patch: feel free to drop if make WHAT=... works without it
    Feel free to ask any question

ad removing contrib tarball: even though kubernetes/contrib is read-only repo, it's still valid to pick all the service and config files from the tarball. The idea was to minimize what we ship alongside the spec file. Unless you have a serious reason, please keep it as it is. In case you have to change some lines, use a patch instead. In case too many bits need to be changed, feel free to copy paste relevant files (as it is now) and make the changes in-situ.

OK, actually most of these files are very deprecated, journalctl is spanned with "deperated" warnings:
Flag * has been deprecated, This parameter should be set via the config file specified by the Kubelet's --config flag.

I can try to change to the new config style, and that will many patches, bring the whole contrib repo just to grab a few file, then override with another lots of patches (and the patches will grow as no contrib is archived) doesn't looks very good.

But just my thought, if you think it's better to keep use the repo I'll keep using it then.

ad removing hyperkube binary: please don't. Hyperkube binary carries all relevant binaries (e.g. kube-proxy, kube-controller-manager, kubelet, ...) as a single binary for minimizing memory requirements of containerized kubernetes image. Without hyperkube, size of the image will increase significantly.

I found the hyperkube is being deprecated:
https://github.com/kubernetes/kubernetes/pull/88676
https://github.com/kubernetes/kubernetes/pull/83454

I see there is a script for building hyperkube after it:
https://github.com/kubernetes/kubernetes/pull/84662/files
It's just a script wrapper for calling other binary, could be useful for building image but didn't see how will that be helpful for packaging in distro.

If I may lack of some background knowledge here, please let me know.

ad removing patches:
- make-e2e_node-run-over-distro-bins.patch: ok to drop, it was purely for testing purposes
- make-test-cmd-run-over-hyperkube-based-kubectl.patch: this one is tricky, we need it so kube-apiserver can't be run through hyperkube. kube-apiserver requires additional capabilities (e.g. for opening privileged port).

Hmm, but the patch have never been applied (has been commented out since 2017, commit dbc1b82). I'll check the %check part more carefully now and see if anything is failing.

  • fix-support-for-ppc64le.patch: unless I am mistaken, ppc64le is still one of supported architectures, unless upstream updated their scripts, we still need the patch
  • Hide-bearer-token-in-logs-upstream-81330.patch: ok to drop (it's already part of 1.18)
  • Remove-go-mod.patch: feel free to drop if make WHAT=... works without it
    Feel free to ask any question

Thanks for the comments!

  • fix-support-for-ppc64le.patch: unless I am mistaken, ppc64le is still one of supported architectures, unless upstream updated their scripts, we still need the patch

It seems that it is no longer needed, just tested build of kube with this PR applied on ppc64le. Seems that the build script is fixed. But the dropped patch is not removed. @kasong please delete also the patch file, fix-support-for-ppc64le.patch.

Will do, and I didn't do function test about it but build will break with this patch.

actually most of these files are very deprecated, journalctl is spanned with "deperated" warnings:
Flag * has been deprecated, This parameter should be set via the config file specified by the Kubelet's --config flag.
if you think it's better to keep use the repo I'll keep using it then.

Convinced

I found the hyperkube is being deprecated:
https://github.com/kubernetes/kubernetes/pull/88676
https://github.com/kubernetes/kubernetes/pull/83454

I see there is a script for building hyperkube after it:
https://github.com/kubernetes/kubernetes/pull/84662/files
It's just a script wrapper for calling other binary, could be useful for building image but didn't see how will that be helpful for packaging in distro.

Seems there's no replacement for hyperkube right now: https://github.com/kubernetes/kubernetes/pull/88676#issuecomment-600564123

@walters is anyone still installing kubernetes-master/node from fedora to build an image at all these days? Given hyperkube is now gone, the latest version in rawhide was v.1.15 for a long time, I doubt there are any consumers of k8s containers built from fedora rpms. Also, it's way better to build k8s binaries in particular images through go build rather then installing rpms these days. Also, given the state of maintenance of k8s in Fedora (none), dropping hyperkube binary and returning back to individual binaries seems harmless.

Hmm, but the patch have never been applied (has been commented out since 2017,

You are right.

OKD 4 exists now which uses Fedora CoreOS for the base OS, but uses OpenShift's build system for kubernetes.

I don't have a strong opinion on this though, whatever is easier for maintenance. I've kind of given up on the size battle lately.

@kasong looks good in overall. Can you address the nits suggested by @eclipseo

Can you squash your commits? And add your own changelog entry?
Also what's preventing you from uploading to dist-git?

I can upload the missing tarball into the cache in case you don't have perms to do it. Though, as long as you are a packager (IINM), you should be.

Sure, was busy with other things last week, will update this PR.

rebased onto 3cd5654

4 years ago

updated, please help have a look.

4 new commits added

  • Update to v1.18.2
  • Update service file and config file
  • "contrib" is EOL, move files into this repo
  • Update the build steps to fit latest upstream
4 years ago

Pull-Request has been merged by jchaloup

4 years ago

@kasong thanks for your patience!!!