Skip to content

Fix issues of GitFS providers with GitCLI #68926

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

Merged
dwoz merged 6 commits into from
Apr 16, 2026
Merged

Fix issues of GitFS providers with GitCLI #68926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8ed6c5
Implement GitCLI provider for GitFS
dwoz Apr 13, 2026
b9dac7e
Lint and pre-commit fixes for GitCLI provider
dwoz Apr 13, 2026
7dac0ad
Fix regression in GitBase initialization for non-standard providers
dwoz Apr 13, 2026
2d58598
Initialize GitCLI attributes before super().__init__
dwoz Apr 13, 2026
f22f5df
Lint fixes for GitCLI provider
dwoz Apr 13, 2026
401e42d
Fix GitCLI environment filtering and cleanup duplication
dwoz Apr 15, 2026
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
2 changes: 2 additions & 0 deletions agents/docs/architecture.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ Salt includes a file server that serves files to minions:
- Multiple backends: local, git, S3, HTTP, etc.
- Files are cached on minions

For details on the Git backends and performance, see [GitFS Providers](gitfs-providers.md).

## Targeting

Minions can be targeted in multiple ways:
Expand Down
10 changes: 10 additions & 0 deletions salt/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,9 @@ def _gather_buffer_space():
"git_pillar_refspecs": _DFLT_REFSPECS,
"git_pillar_includes": True,
"git_pillar_proxy": "",
"git_pillar_depth": 1,
"git_pillar_ref_types": ["branch", "tag", "sha"],
"git_pillar_disable_saltenv_mapping": False,
"gitfs_remotes": [],
"gitfs_mountpoint": "",
"gitfs_root": "",
Expand All @@ -1202,6 +1205,7 @@ def _gather_buffer_space():
"gitfs_refspecs": _DFLT_REFSPECS,
"gitfs_disable_saltenv_mapping": False,
"gitfs_proxy": "",
"gitfs_depth": 1,
"unique_jid": False,
"hash_type": DEFAULT_HASH_TYPE,
"optimization_order": [0, 1, 2],
Expand Down Expand Up @@ -1308,6 +1312,7 @@ def _gather_buffer_space():
"winrepo_pubkey": "",
"winrepo_passphrase": "",
"winrepo_refspecs": _DFLT_REFSPECS,
"winrepo_depth": 1,
"pidfile": os.path.join(salt.syspaths.PIDFILE_DIR, "salt-minion.pid"),
"range_server": "range:80",
"reactor_refresh_interval": 60,
Expand Down Expand Up @@ -1451,6 +1456,9 @@ def _gather_buffer_space():
"git_pillar_includes": True,
"git_pillar_verify_config": True,
"git_pillar_proxy": "",
"git_pillar_depth": 1,
"git_pillar_ref_types": ["branch", "tag", "sha"],
"git_pillar_disable_saltenv_mapping": False,
"gitfs_remotes": [],
"gitfs_mountpoint": "",
"gitfs_root": "",
Expand All @@ -1471,6 +1479,7 @@ def _gather_buffer_space():
"gitfs_refspecs": _DFLT_REFSPECS,
"gitfs_disable_saltenv_mapping": False,
"gitfs_proxy": "",
"gitfs_depth": 1,
"hgfs_remotes": [],
"hgfs_mountpoint": "",
"hgfs_root": "",
Expand Down Expand Up @@ -1649,6 +1658,7 @@ def _gather_buffer_space():
"winrepo_pubkey": "",
"winrepo_passphrase": "",
"winrepo_refspecs": _DFLT_REFSPECS,
"winrepo_depth": 1,
"syndic_wait": 5,
"jinja_env": {},
"jinja_sls_env": {},
Expand Down
3 changes: 2 additions & 1 deletion salt/fileserver/gitfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@
"ref_types",
"update_interval",
"proxy",
"depth",
)
PER_REMOTE_ONLY = ("all_saltenvs", "name", "saltenv")

# Auth support (auth params can be global or per-remote, too)
AUTH_PROVIDERS = ("pygit2",)
AUTH_PROVIDERS = ("pygit2", "gitcli")
AUTH_PARAMS = ("user", "password", "pubkey", "privkey", "passphrase", "insecure_auth")


Expand Down
3 changes: 3 additions & 0 deletions salt/pillar/git_pillar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@
"refspecs",
"fallback",
"proxy",
"ref_types",
"disable_saltenv_mapping",
"depth",
)
PER_REMOTE_ONLY = ("name", "mountpoint", "all_saltenvs")
GLOBAL_ONLY = ("branch",)
Expand Down
Loading
Loading