Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Behavior change: start with no arguments uses existing cluster config #7449

Merged
merged 21 commits into from
Apr 8, 2020
Merged

Behavior change: start with no arguments uses existing cluster config #7449

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
792ca63
respect the user existing config
medyagh Apr 6, 2020
a350065
add new func updateExistingConfigFromFlags
medyagh Apr 6, 2020
bee6815
save profile
medyagh Apr 6, 2020
b777d97
refactor more
medyagh Apr 6, 2020
1d892a2
fix it
medyagh Apr 6, 2020
2c037b4
fix unit test
medyagh Apr 6, 2020
9c0e5df
remove most of the viper calls from node start
medyagh Apr 6, 2020
5517e2b
remove debugging statement
medyagh Apr 6, 2020
ee1f8ff
remove duplicate setDockerProxy
medyagh Apr 6, 2020
84693ea
add wait flag to updateExistingConfigFromFlags
medyagh Apr 6, 2020
52fee50
add soft start test
medyagh Apr 7, 2020
67f1276
add soft start integeration test
medyagh Apr 7, 2020
2a66c8c
add log for how long soft start took
medyagh Apr 7, 2020
d9fa543
fix comment
medyagh Apr 7, 2020
e4abe73
lint
medyagh Apr 7, 2020
c4f5f4d
fix
medyagh Apr 7, 2020
26c999a
fix select default cni
medyagh Apr 7, 2020
e683dd3
warn if changed memory cpu of an exiting cluster
medyagh Apr 7, 2020
dfd9f7a
handle Port 0 in configs
medyagh Apr 7, 2020
c11e642
put apiPort in a variable
medyagh Apr 7, 2020
65e1ff3
remove duplicate checking existing driver flag
medyagh Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove duplicate setDockerProxy
  • Loading branch information
@medyagh
medyagh committed Apr 7, 2020
commit ee1f8fffb3d7a755fc8bf6c356d5d50fc8a72e57
7 changes: 1 addition & 6 deletions cmd/minikube/cmd/start_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}

// Feed Docker our host proxy environment by default, so that it can pull images
if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
setDockerProxy()
}

if cmd.Flags().Changed(imageRepository) {
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}
Expand Down Expand Up @@ -280,7 +275,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
}

// Feed Docker our host proxy environment by default, so that it can pull images
// redoing setDockerProxy in case proxy changed since last start.
// doing this for both new config and existing, in case proxy changed since previous start
if _, ok := r.(*cruntime.Docker); ok && !cmd.Flags().Changed("docker-env") {
setDockerProxy()
}
Expand Down