Skip to content

[master] Support master tops on masterless minions #65481

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
Merged
s0undt3ch merged 3 commits into from
Nov 17, 2023
Merged

[master] Support master tops on masterless minions #65481

s0undt3ch merged 3 commits into from
Nov 17, 2023

Conversation

@lkubb
Copy link
Contributor

@lkubb lkubb commented Oct 28, 2023 •
edited
Loading

What does this PR do?

  • Renders master tops locally when opts["file_client"] == "local".
  • Adds sync_tops to the saltutil execution and state modules
  • Makes salt-ssh master tops behave like regular ones (merging returns for the same saltenv)

What issues does this PR fix or reference?

Fixes: #65479
Fixes: #65480
Fixes: #27930 (closed because stale)

Previous Behavior

  • master tops are ignored on masterless minions
  • multiple master tops override each other with salt-ssh if they return definitions for the same saltenv

New Behavior

  • master tops are provided as usual, both for masterless minions and salt-ssh

Merge requirements satisfied?

Commits signed with GPG?

Yes

@lkubb
Support master tops on masterless minions
0683e8c 
Also, make salt-ssh master tops behave like regular ones, i.e. merge the
returns of multiple master top modules for the same environment.
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Support master tops on masterless minions [master] Support master tops on masterless minions Oct 28, 2023
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:26 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:26 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:29 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:29 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:29 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 20:29 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:02 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb temporarily deployed to ci October 28, 2023 22:32 — with GitHub Actions Inactive
@lkubb lkubb marked this pull request as ready for review October 28, 2023 23:06
@lkubb lkubb requested a review from a team as a code owner October 28, 2023 23:06
@lkubb lkubb requested review from felippeb and removed request for a team October 28, 2023 23:06
@s0undt3ch s0undt3ch merged commit d7338a0 into saltstack:master Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@twangboy twangboy twangboy approved these changes

@felippeb felippeb Awaiting requested review from felippeb felippeb was automatically assigned from saltstack/team-core

+1 more reviewer

@s0undt3ch s0undt3ch s0undt3ch approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

3 participants

@lkubb @s0undt3ch @twangboy