Fix the verify job

Small changes to fix the verify job. Add the proper headers, fix lint
errors, etc...
This commit is contained in:
mattjmcnaughton 2020-02-27 09:29:39 -05:00
parent 4a8da5e7b4
commit 29fa1f4566
No known key found for this signature in database
GPG Key ID: BC530981A9A1CC9D
5 changed files with 22 additions and 2 deletions

View File

@ -49,7 +49,6 @@ go_library(
"//pkg/kubelet/dockershim/network/cni:go_default_library",
"//pkg/kubelet/dockershim/network/hostport:go_default_library",
"//pkg/kubelet/dockershim/network/kubenet:go_default_library",
"//pkg/kubelet/kuberuntime:go_default_library",
"//pkg/kubelet/leaky:go_default_library",
"//pkg/kubelet/legacy:go_default_library",
"//pkg/kubelet/server/streaming:go_default_library",

View File

@ -1,3 +1,5 @@
// +build !dockerless
/*
Copyright 2016 The Kubernetes Authors.

View File

@ -1,3 +1,19 @@
// +build dockerless
/*
Copyright 2020 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 dockershim

View File

@ -236,6 +236,9 @@ type Dependencies struct {
useLegacyCadvisorStats bool
}
// DockerOptions contains docker specific configuration. Importantly, since it
// lives outside of `dockershim`, it should not depend on the `docker/docker`
// client library.
type DockerOptions struct {
DockerEndpoint string
RuntimeRequestTimeout time.Duration

View File

@ -32,5 +32,5 @@ func runDockershim(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
remoteImageEndpoint string,
nonMasqueradeCIDR string) error {
return fmt.Errorf("Trying to use docker runtime, w/ Kubelet compiled w/o docker support.")
return fmt.Errorf("trying to use docker runtime, w/ Kubelet compiled w/o docker support")
}