github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74510 from SataQiu/fix-golint-2019022502 

Fix some golint failures for pkg/kubelet/apis/...
pull/564/head
Kubernetes Prow Robot 2019-03-06 17:59:25 -08:00 committed by GitHub
parent 8178fa1b13 7181c44230
commit 752d18d2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/.golint_failures
View File

@ -71,7 +71,6 @@ pkg/capabilities
pkg/cloudprovider/providers/fake pkg/cloudprovider/providers/fake
pkg/cloudprovider/providers/photon pkg/cloudprovider/providers/photon
pkg/cloudprovider/providers/vsphere pkg/cloudprovider/providers/vsphere
pkg/cloudprovider/providers/vsphere/vclib
pkg/controller pkg/controller
pkg/controller/apis/config/v1alpha1 pkg/controller/apis/config/v1alpha1
pkg/controller/bootstrap pkg/controller/bootstrap
@ -161,10 +160,7 @@ pkg/kubelet/apis
pkg/kubelet/apis/config pkg/kubelet/apis/config
pkg/kubelet/apis/config/v1beta1 pkg/kubelet/apis/config/v1beta1
pkg/kubelet/apis/cri/testing pkg/kubelet/apis/cri/testing
pkg/kubelet/apis/deviceplugin/v1alpha
pkg/kubelet/apis/deviceplugin/v1beta1 pkg/kubelet/apis/deviceplugin/v1beta1
pkg/kubelet/apis/pluginregistration/v1alpha1
pkg/kubelet/apis/pluginregistration/v1beta1
pkg/kubelet/cadvisor pkg/kubelet/cadvisor
pkg/kubelet/cadvisor/testing pkg/kubelet/cadvisor/testing
pkg/kubelet/checkpoint pkg/kubelet/checkpoint

10
pkg/cloudprovider/providers/vsphere/vclib/connection_test.go
View File

@ -85,7 +85,7 @@ func TestWithValidCaCert(t *testing.T) {
server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler) server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler)
server.StartTLS() server.StartTLS()
u := mustParseUrl(t, server.URL) u := mustParseURL(t, server.URL)
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: u.Hostname(), Hostname: u.Hostname(),
@ -104,7 +104,7 @@ func TestWithVerificationWithWrongThumbprint(t *testing.T) {
server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler) server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler)
server.StartTLS() server.StartTLS()
u := mustParseUrl(t, server.URL) u := mustParseURL(t, server.URL)
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: u.Hostname(), Hostname: u.Hostname(),
@ -124,7 +124,7 @@ func TestWithVerificationWithoutCaCertOrThumbprint(t *testing.T) {
server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler) server, _ := createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler)
server.StartTLS() server.StartTLS()
u := mustParseUrl(t, server.URL) u := mustParseURL(t, server.URL)
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: u.Hostname(), Hostname: u.Hostname(),
@ -142,7 +142,7 @@ func TestWithValidThumbprint(t *testing.T) {
server, thumbprint := server, thumbprint :=
createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler) createTestServer(t, fixtures.CaCertPath, fixtures.ServerCertPath, fixtures.ServerKeyPath, handler)
server.StartTLS() server.StartTLS()
u := mustParseUrl(t, server.URL) u := mustParseURL(t, server.URL)
connection := &vclib.VSphereConnection{ connection := &vclib.VSphereConnection{
Hostname: u.Hostname(), Hostname: u.Hostname(),
@ -213,7 +213,7 @@ func getRequestVerifier(t *testing.T) (http.HandlerFunc, func()) {
return handler, checker return handler, checker
} }
func mustParseUrl(t *testing.T, i string) *url.URL { func mustParseURL(t *testing.T, i string) *url.URL {
u, err := url.Parse(i) u, err := url.Parse(i)
if err != nil { if err != nil {
t.Fatalf("Cannot parse URL: %v", err) t.Fatalf("Cannot parse URL: %v", err)

2
pkg/kubelet/apis/deviceplugin/v1alpha/constants.go
View File

@ -22,7 +22,7 @@ const (
// Unhealthy means that the device is unhealthy // Unhealthy means that the device is unhealthy
Unhealthy = "Unhealthy" Unhealthy = "Unhealthy"
// Current version of the API supported by kubelet // Version is the current version of the API supported by kubelet
Version = "v1alpha2" Version = "v1alpha2"
// DevicePluginPath is the folder the Device Plugin is expecting sockets to be on // DevicePluginPath is the folder the Device Plugin is expecting sockets to be on
// Only privileged pods have access to this path // Only privileged pods have access to this path

4
pkg/kubelet/apis/pluginregistration/v1alpha1/constants.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package pluginregistration package pluginregistration
const ( const (
CSIPlugin = "CSIPlugin" // CSIPlugin identifier for registered CSI plugins
CSIPlugin = "CSIPlugin"
// DevicePlugin identifier for registered device plugins
DevicePlugin = "DevicePlugin" DevicePlugin = "DevicePlugin"
) )

4
pkg/kubelet/apis/pluginregistration/v1beta1/constants.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package pluginregistration package pluginregistration
const ( const (
CSIPlugin = "CSIPlugin" // CSIPlugin identifier for registered CSI plugins
CSIPlugin = "CSIPlugin"
// DevicePlugin identifier for registered device plugins
DevicePlugin = "DevicePlugin" DevicePlugin = "DevicePlugin"
) )