Fix some minor gofmt and golint issues
So that "make gofmt" and "make golint" go green againpull/8145/head
parent
462adcb305
commit
a4d872faee
|
@ -353,7 +353,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
|
||||||
|
|
||||||
// updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
|
// updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
|
||||||
// skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
|
// skipping updating existing docker env , docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
|
||||||
func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig { //nolint to supress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
|
func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig { //nolint to suppress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
|
||||||
validateFlags(cmd, existing.Driver)
|
validateFlags(cmd, existing.Driver)
|
||||||
|
|
||||||
if cmd.Flags().Changed(containerRuntime) {
|
if cmd.Flags().Changed(containerRuntime) {
|
||||||
|
|
|
@ -33,7 +33,7 @@ type rewrite struct {
|
||||||
// outputs possible drivers for the operating system
|
// outputs possible drivers for the operating system
|
||||||
func rewriteFlags(command *cobra.Command) error {
|
func rewriteFlags(command *cobra.Command) error {
|
||||||
rewrites := map[string][]rewrite{
|
rewrites := map[string][]rewrite{
|
||||||
"start": []rewrite{{
|
"start": {{
|
||||||
flag: "driver",
|
flag: "driver",
|
||||||
usage: "Used to specify the driver to run Kubernetes in. The list of available drivers depends on operating system.",
|
usage: "Used to specify the driver to run Kubernetes in. The list of available drivers depends on operating system.",
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -31,7 +31,7 @@ const (
|
||||||
SystemPodsWaitKey = "system_pods"
|
SystemPodsWaitKey = "system_pods"
|
||||||
// DefaultSAWaitKey is the name used in the flags for default service account
|
// DefaultSAWaitKey is the name used in the flags for default service account
|
||||||
DefaultSAWaitKey = "default_sa"
|
DefaultSAWaitKey = "default_sa"
|
||||||
// AppsRunning is the name used in the flags for waiting for k8s-apps to be running
|
// AppsRunningKey is the name used in the flags for waiting for k8s-apps to be running
|
||||||
AppsRunningKey = "apps_running"
|
AppsRunningKey = "apps_running"
|
||||||
// NodeReadyKey is the name used in the flags for waiting for the node status to be ready
|
// NodeReadyKey is the name used in the flags for waiting for the node status to be ready
|
||||||
NodeReadyKey = "node_ready"
|
NodeReadyKey = "node_ready"
|
||||||
|
|
|
@ -51,7 +51,7 @@ const (
|
||||||
DefaultServiceCIDR = "10.96.0.0/12"
|
DefaultServiceCIDR = "10.96.0.0/12"
|
||||||
// HostAlias is a DNS alias to the the container/VM host IP
|
// HostAlias is a DNS alias to the the container/VM host IP
|
||||||
HostAlias = "host.minikube.internal"
|
HostAlias = "host.minikube.internal"
|
||||||
// ControlPaneAlias is a DNS alias pointing to the apiserver frontend
|
// ControlPlaneAlias is a DNS alias pointing to the apiserver frontend
|
||||||
ControlPlaneAlias = "control-plane.minikube.internal"
|
ControlPlaneAlias = "control-plane.minikube.internal"
|
||||||
|
|
||||||
// DockerHostEnv is used for docker daemon settings
|
// DockerHostEnv is used for docker daemon settings
|
||||||
|
|
|
@ -29,6 +29,7 @@ import (
|
||||||
"k8s.io/minikube/pkg/minikube/constants"
|
"k8s.io/minikube/pkg/minikube/constants"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Binary holds a minikube binary
|
||||||
type Binary struct {
|
type Binary struct {
|
||||||
path string
|
path string
|
||||||
pr int
|
pr int
|
||||||
|
|
Loading…
Reference in New Issue