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

Merge pull request #73854 from RajatVaryani/master 

Fix linting in cmd/kubemark package
pull/564/head
Kubernetes Prow Robot 2019-02-08 22:00:24 -08:00 committed by GitHub
parent ee44e24cd3 17fd66946b
commit 40a4c1f723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kubemark/hollow-node.go
View File

@ -49,7 +49,7 @@ import (
fakeexec "k8s.io/utils/exec/testing" fakeexec "k8s.io/utils/exec/testing"
) )
type HollowNodeConfig struct { type hollowNodeConfig struct {
KubeconfigPath string KubeconfigPath string
KubeletPort int KubeletPort int
KubeletReadOnlyPort int KubeletReadOnlyPort int
@ -71,7 +71,7 @@ const (
// and make the config driven. // and make the config driven.
var knownMorphs = sets.NewString("kubelet", "proxy") var knownMorphs = sets.NewString("kubelet", "proxy")
func (c *HollowNodeConfig) addFlags(fs *pflag.FlagSet) { func (c *hollowNodeConfig) addFlags(fs *pflag.FlagSet) {
fs.StringVar(&c.KubeconfigPath, "kubeconfig", "/kubeconfig/kubeconfig", "Path to kubeconfig file.") fs.StringVar(&c.KubeconfigPath, "kubeconfig", "/kubeconfig/kubeconfig", "Path to kubeconfig file.")
fs.IntVar(&c.KubeletPort, "kubelet-port", 10250, "Port on which HollowKubelet should be listening.") fs.IntVar(&c.KubeletPort, "kubelet-port", 10250, "Port on which HollowKubelet should be listening.")
fs.IntVar(&c.KubeletReadOnlyPort, "kubelet-read-only-port", 10255, "Read-only port on which Kubelet is listening.") fs.IntVar(&c.KubeletReadOnlyPort, "kubelet-read-only-port", 10255, "Read-only port on which Kubelet is listening.")
@ -84,7 +84,7 @@ func (c *HollowNodeConfig) addFlags(fs *pflag.FlagSet) {
fs.DurationVar(&c.ProxierMinSyncPeriod, "proxier-min-sync-period", 0, "Minimum period that proxy rules are refreshed in hollow-proxy.") fs.DurationVar(&c.ProxierMinSyncPeriod, "proxier-min-sync-period", 0, "Minimum period that proxy rules are refreshed in hollow-proxy.")
} }
func (c *HollowNodeConfig) createClientConfigFromFile() (*restclient.Config, error) { func (c *hollowNodeConfig) createClientConfigFromFile() (*restclient.Config, error) {
clientConfig, err := clientcmd.LoadFromFile(c.KubeconfigPath) clientConfig, err := clientcmd.LoadFromFile(c.KubeconfigPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("error while loading kubeconfig from file %v: %v", c.KubeconfigPath, err) return nil, fmt.Errorf("error while loading kubeconfig from file %v: %v", c.KubeconfigPath, err)
@ -121,7 +121,7 @@ func main() {
// newControllerManagerCommand creates a *cobra.Command object with default parameters // newControllerManagerCommand creates a *cobra.Command object with default parameters
func newHollowNodeCommand() *cobra.Command { func newHollowNodeCommand() *cobra.Command {
s := &HollowNodeConfig{} s := &hollowNodeConfig{}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "kubemark", Use: "kubemark",
@ -136,7 +136,7 @@ func newHollowNodeCommand() *cobra.Command {
return cmd return cmd
} }
func run(config *HollowNodeConfig) { func run(config *hollowNodeConfig) {
if !knownMorphs.Has(config.Morph) { if !knownMorphs.Has(config.Morph) {
klog.Fatalf("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List()) klog.Fatalf("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List())
} }

1
hack/.golint_failures
View File

@ -9,7 +9,6 @@ cmd/kubeadm/app/util/config
cmd/kubeadm/app/util/system cmd/kubeadm/app/util/system
cmd/kubelet/app cmd/kubelet/app
cmd/kubelet/app/options cmd/kubelet/app/options
cmd/kubemark
pkg/apis/abac/latest pkg/apis/abac/latest
pkg/apis/admission pkg/apis/admission
pkg/apis/admission/v1beta1 pkg/apis/admission/v1beta1