kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused vars

pull/6043/head
Thomas Stromberg 2019-12-10 08:17:08 -08:00
parent 8b7aaba627
commit 14b805d494
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/minikube/cmd/start.go
View File

@ -645,7 +645,7 @@ func validateDriver(name string, existing *cfg.MachineConfig) {
exit.WithCodeT(exit.Config, "Exiting.")
}
func selectImageRepository(mirrorCountry string, k8sVersion string) (bool, string, error) {
func selectImageRepository(mirrorCountry string) (bool, string, error) {
var tryCountries []string
var fallback string
glog.Infof("selecting image repository for country %s ...", mirrorCountry)
@ -866,7 +866,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
repository := viper.GetString(imageRepository)
mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, k8sVersion)
found, autoSelectedRepository, err := selectImageRepository(mirrorCountry)
if err != nil {
exit.WithError("Failed to check main repository and mirrors for images for images", err)
}

4
pkg/minikube/cruntime/containerd.go
View File

@ -169,7 +169,7 @@ func (r *Containerd) Available() error {
}
// generateContainerdConfig sets up /etc/containerd/config.toml
func generateContainerdConfig(cr CommandRunner, imageRepository string, k8sVersion string) error {
func generateContainerdConfig(cr CommandRunner, imageRepository string) error {
cPath := containerdConfigFile
t, err := template.New("containerd.config.toml").Parse(containerdConfigTemplate)
if err != nil {
@ -198,7 +198,7 @@ func (r *Containerd) Enable(disOthers bool) error {
if err := populateCRIConfig(r.Runner, r.SocketPath()); err != nil {
return err
}
if err := generateContainerdConfig(r.Runner, r.ImageRepository, r.KubernetesVersion); err != nil {
if err := generateContainerdConfig(r.Runner, r.ImageRepository); err != nil {
return err
}
if err := enableIPForwarding(r.Runner); err != nil {

2
pkg/minikube/cruntime/cri.go
View File

@ -407,7 +407,7 @@ image-endpoint: unix://{{.Socket}}
}
// generateCRIOConfig sets up /etc/crio/crio.conf
func generateCRIOConfig(cr CommandRunner, imageRepository string, k8sVersion string) error {
func generateCRIOConfig(cr CommandRunner, imageRepository string) error {
cPath := crioConfigFile
t, err := template.New("crio.conf").Parse(crioConfigTemplate)
if err != nil {

2
pkg/minikube/cruntime/crio.go
View File

@ -98,7 +98,7 @@ func (r *CRIO) Enable(disOthers bool) error {
if err := populateCRIConfig(r.Runner, r.SocketPath()); err != nil {
return err
}
if err := generateCRIOConfig(r.Runner, r.ImageRepository, r.KubernetesVersion); err != nil {
if err := generateCRIOConfig(r.Runner, r.ImageRepository); err != nil {
return err
}
if err := enableIPForwarding(r.Runner); err != nil {