Set defaults from params after loading files, allowing params to override #44142
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
ansibot
added
affects_2.7
willthames
previously requested changes
Aug 14, 2018
| if auth_method == 'params': | ||
| return DynamicClient(kubernetes.client.ApiClient(configuration)) | ||
| configuration = kubernetes.client.Configuration() | ||
| for key, value in iteritems(auth): |
There was a problem hiding this comment.
should be auth.items() for python 2 and 3 compatibility.
Edit: I see iteritems comes from six, I'm just not sure why it's needed when auth.items() will work fine
| @@ -139,46 +139,37 @@ def get_api_client(self, **auth_params): | |||
| auth_params = auth_params or getattr(self, 'params', {}) | |||
| auth = copy.deepcopy(auth_params) | |||
|
|
|||
| configuration = kubernetes.client.Configuration() | |||
| # Pull authorization settings from environment variables | |||
There was a problem hiding this comment.
Comment here should be more extensive and state precisely what order we're processing configuration.
|
The test |
ansibot
added
ci_verified
marwatk
reviewed
Aug 15, 2018
|
|
||
| kubernetes.client.Configuration.set_default(configuration) | ||
| return DynamicClient(kubernetes.client.ApiClient(configuration)) | ||
|
|
||
|
|
||
| def client_from_kubeconfig(self, config_file, context): |
There was a problem hiding this comment.
After this refactor this method is no longer referenced, probably safe to remove?
ansibot
removed
the
ci_verified
ansibot
added
the
stale_ci
|
@maxamillion I've fixed the client issue that caused the build to fail, can we rekick? |
ansibot
added
stale_review
fabianvf
changed the title
|
@willthames, mind doing another pass? |
This was referenced Aug 31, 2018
ansibot
added
the
stale_ci
|
@willthames, any chance you could take a look at this? I'd love to ditch my local patch... |
|
@willthames @maxamillion can we get this reviewed and merged soon so we can get this into 2.7 before release? |
maxamillion
approved these changes
Sep 10, 2018
|
rebuild_merge |
|
@fabianvf one this merges, we'll need a backport PR against |
maxamillion
dismissed
willthames’s stale review
was asked for response 10 days ago, but still no response.
|
rebuild_merge |
ansibot
added
needs_revision
|
rebuild_merge |
ansibot
removed
the
needs_revision
fabianvf
added a commit
to fabianvf/ansible
that referenced
this pull request
Sep 10, 2018
…ride (ansible#44142) * Set defaults from params after loading files, allowing params to override * cleanup, add some comments (cherry picked from commit aa01d9d)
abadger
pushed a commit
that referenced
this pull request
Sep 11, 2018
…ride (#45442) * Set defaults from params after loading files, allowing params to override (#44142) * Set defaults from params after loading files, allowing params to override * cleanup, add some comments (cherry picked from commit aa01d9d) * Add client_from_kubeconfig function back for 2.7.0 since it's late in the 2.7 cycle to remove module_util code.
ndswartz
pushed a commit
to ndswartz/ansible
that referenced
this pull request
Nov 28, 2018
…ride (ansible#45442) * Set defaults from params after loading files, allowing params to override (ansible#44142) * Set defaults from params after loading files, allowing params to override * cleanup, add some comments (cherry picked from commit aa01d9d) * Add client_from_kubeconfig function back for 2.7.0 since it's late in the 2.7 cycle to remove module_util code.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
I think this should give parameters to the module priority over incluster/kubeconfig-based authentication.
Fixes #43845
ISSUE TYPE
COMPONENT NAME
k8s
ANSIBLE VERSION