Add CLI flag --config for configuring the global config location
#2555
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
corneliusweig
requested review from
balopat,
dgageot,
nkubala,
priyawadhwa and
tejal29
as code owners
corneliusweig
force-pushed
the
w/fix-global-config
branch
2 times, most recently
from
16c1607 to
ab53659
Compare
Codecov Report
|
corneliusweig
force-pushed
the
w/fix-global-config
branch
from
ab53659 to
28c4553
Compare
nkubala
reviewed
Aug 8, 2019
There was a problem hiding this comment.
this actually looks really good! it's definitely more code than before, but I think in general it's easier to reason about. can you rebase so we can get CI green?
also, is this PR meant to be merged before #2590? i'm a bit confused on the order of them since a lot of the code is the same.
pkg/skaffold/config/util_test.go
Outdated
| DefaultRepo: "my-public-registry", | ||
| }, | ||
| }, | ||
| /* todo(corneliusweig): this behavior can be enabled with `mergo.WithAppendSlice` -> clarify requirements |
There was a problem hiding this comment.
is this something you can address right now? what was stopping you from including it before?
There was a problem hiding this comment.
Because the `skaffold config` subcommands are in a separate package, they cannot access this flag, therefore this flag cannot be fully global. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
- when retrieving the config for a given kube-context, merge the result with the global values - cache merged config - simplify logic of GetInsecureRegistries, GetLocalCluster, and GetDefaultRepo - allow to override ReadConfigFile with uncached implementation for tests Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
This package now uses the config utils from pkg/skaffold/config Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
corneliusweig
force-pushed
the
w/fix-global-config
branch
from
505f37e to
91a1d0d
Compare
|
@corneliusweig thanks! I tried rebasing through the github UI, with surprising success....but then I introduced a lint error and wasn't able to fix that through the UI 🤦♂️ I'll merge this as soon as it's green! |
|
@nkubala well, that looks like a test flake. Should I trigger again? |
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
corneliusweig
force-pushed
the
w/fix-global-config
branch
from
c7ef098 to
2c75a47
Compare
|
@nkubala I triggered again, so everything is green now :) |
nkubala
approved these changes
Aug 14, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So far,
skaffold confighas a--configflag, to modify skaffold configs with non-standard locations (default is$HOME/.skaffold/config). Other Skaffold commands do not have a flag to set the config location (see #2468).This PR adds a config flag to configure the location of the global config for the
run,dev,debug,build,deploy,delete, anddiagnosesubcommands. The reason for not making this flag global (such as--color) is thatskaffold confighas no access to the Skaffold options, so it would require an awkward workaround. Let me know if this makes sense.To achieve its goal, this PR required a substantial refactoring of the global config handling. I hope it got simpler.
Fixes #2468
Related #2554