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.

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

Docker login 51531 #51571

Closed
wants to merge 3 commits into from
Closed

Docker login 51531 #51571

wants to merge 3 commits into from

Conversation

c4t3l
Copy link

@c4t3l c4t3l commented Feb 9, 2019

What does this PR do?

Adds functionality for setting docker login info from pillar and master/minion config files.

What issues does this PR fix or reference?

References #51531

Previous Behavior

Docker login execution module only reads configuration data from Pillar.

New Behavior

Docker login execution module now reads configuration data from minion, master, and pillar.

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

…nsulting Pillar.

Data structure is required to only pass `docker-registries` key.

Fixes saltstack#51531.
…nsulting Pillar.

Data structure is required to only pass `docker-registries` key.

Corrected typo in config.option call.

Fixes saltstack#51531.
…nsulting Pillar.

Data structure is required to only pass `docker-registries` key.

Corrected typo in config.option call.

Corrected grammar in docstring.

Fixes saltstack#51531.
Copy link
Contributor

@terminalmage terminalmage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not a fan of this implementation for a couple reasons:

  1. It drops support for using config keys ending in -docker-registries, functionality that many users likely rely on.
  2. It uses config.option instead of config.get which is widely used elsewhere in dockermod.py.

In truth, the reason we limited this to Pillar to begin with is because it lets you store the secrets somewhere other than the minion config file. I'm not convinced it's a great idea to store them elsewhere, but as long as it's properly documented and people are aware of the risk they are taking, I guess I'm OK with it.

However, I think it can be done in a way that doesn't break existing users' configurations. I'll see what I can come up with.

@terminalmage
Copy link
Contributor

@Akm0d I'm confused as to why you approved this PR, since I gave it a negative review. Did you read my comment?

Additionally, I submitted a more comprehensive fix 4 months ago (#51677) which has yet to be merged and which should supersede this PR.

@Ch3LL
Copy link
Contributor

Ch3LL commented Jun 20, 2019

ping @c4t3l are you okay closing this one in favor of #51677

@c4t3l
Copy link
Author

c4t3l commented Jun 20, 2019 via email

@Ch3LL Ch3LL closed this Jun 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants