Skip to content

feat(dirctl): embed zot into daemon subcommand#1422

Merged
arpad-csepi merged 4 commits into
mainfrom
feat/embed-zot-to-daemon
Apr 29, 2026
Merged

feat(dirctl): embed zot into daemon subcommand#1422
arpad-csepi merged 4 commits into
mainfrom
feat/embed-zot-to-daemon

Conversation

@arpad-csepi
Copy link
Copy Markdown
Member

@arpad-csepi arpad-csepi commented Apr 27, 2026

This PR switch daemon local OCI storage solution to Zot by adding an optional embedded Zot registry to the dir daemon flow, configured with server.store.oci.local_dir, server.store.oci.registry_address, server.store.oci.repository_name.

When defined, the daemon starts Zot as an daemon process and based on the apiserver OCI store config values.

The k8s.io go packages required to be downgraded because zot go package has older version than latest.

These changes enables to provide sync operation and federation in local development environments which detailed here: #1353

Resolves: #1352

@arpad-csepi arpad-csepi added this to the DIR v1.3 milestone Apr 27, 2026
@arpad-csepi arpad-csepi self-assigned this Apr 27, 2026
@arpad-csepi arpad-csepi requested a review from a team as a code owner April 27, 2026 17:06
@github-actions github-actions Bot added the size/M Denotes a PR that changes 200-999 lines label Apr 27, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 27, 2026

The latest Buf updates on your PR. Results from workflow Buf CI / verify-proto (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed⏩ skipped⏩ skipped✅ passedApr 29, 2026, 1:38 PM

@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch 9 times, most recently from c51efbe to 1072454 Compare April 28, 2026 11:28
Comment thread cli/cmd/daemon/config.go Outdated
@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch 9 times, most recently from eabef5c to 5321446 Compare April 28, 2026 15:05
Comment thread server/store/local/local.go Outdated
Comment thread server/store/local/local.go Outdated
Comment thread server/store/oci/config/config.go Outdated
Comment thread server/store/store.go Outdated
Comment thread cli/cmd/daemon/README.md Outdated
@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch 4 times, most recently from 161a3fb to 54762b4 Compare April 29, 2026 12:34
@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch from 54762b4 to 867c98d Compare April 29, 2026 12:37
Comment thread cli/cmd/daemon/start.go Outdated
Comment thread cli/cmd/daemon/start.go
Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch 2 times, most recently from c15cf03 to 534ce13 Compare April 29, 2026 13:29
Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
@arpad-csepi arpad-csepi force-pushed the feat/embed-zot-to-daemon branch from 534ce13 to f1bba96 Compare April 29, 2026 13:37
Copy link
Copy Markdown
Member

@paralta paralta left a comment

Choose a reason for hiding this comment

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

LGTM

@paralta paralta removed this from the DIR v1.3 milestone Apr 29, 2026
@arpad-csepi arpad-csepi merged commit 3d9ce74 into main Apr 29, 2026
34 checks passed
@arpad-csepi arpad-csepi deleted the feat/embed-zot-to-daemon branch April 29, 2026 15:05
keraron pushed a commit to keraron/dir that referenced this pull request May 5, 2026
* chore(dir): format tests taskfile

Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>

* feat(dirctl): add embedded zot into daemon

Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>

* test(dirctl): add embedded zot test case to daemon

Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>

* fix(dir): downgrade k8s packages version to match zot

Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>

---------

Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
Signed-off-by: Aron Kerekes <arkereke@cisco.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/M Denotes a PR that changes 200-999 lines

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature]: Implement embedded Zot integration in daemon startup

3 participants