Skip to content

feat: Add relation with s3 interface#335

Merged
mvlassis merged 31 commits into
mainfrom
kf-8701-s3
Jun 24, 2026
Merged

feat: Add relation with s3 interface#335
mvlassis merged 31 commits into
mainfrom
kf-8701-s3

Conversation

@mvlassis

@mvlassis mvlassis commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add s3-credentials relation using the s3 interface.
  • Add S3 and RelationCountGate Components.
  • Add unit tests
  • Add integration tests, split into 2 distinct files:
    • test_charm.py, which tests the relation with s3-integrator:s3-credentials
    • test_charm_object_storage.py, which tests the relation with minio:object-storage
  • Add matrix testing for both object_storage and s3 in CI

Closes #318

@ckfbot ckfbot added backport track/3.7 Backport to track/3.7 backport track/3.5 Backport to track/3.5 labels Jun 9, 2026
@ckfbot

ckfbot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

🤖 Backport labels populated

Labels to this pull request were added automatically by the populate-labels.yaml action.

When the PR is merged, backport PRs according to the labels will be automatically created. To skip the backport creation, remove any unneeded labels before merging the PR.

@mvlassis mvlassis removed backport track/3.7 Backport to track/3.7 backport track/3.5 Backport to track/3.5 labels Jun 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR adds support for relating argo-controller to S3 backends via the s3 interface (e.g., s3-integrator), while maintaining the existing object-storage path (e.g., MinIO), and updates tests/CI to cover both relation types.

Changes:

  • Added s3-credentials relation and logic to select/configure the active storage backend (S3 vs object-storage), including optional S3 region templating.
  • Split integration tests into dedicated suites for s3-integrator and minio and updated CI to run both via a matrix.
  • Updated unit tests and dependency versions to support the new components.

Reviewed changes

Copilot reviewed 9 out of 12 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
charms/argo-controller/src/charm.py Adds S3 relation component + storage selection and updates template context generation.
charms/argo-controller/metadata.yaml Declares the new s3-credentials required endpoint.
charms/argo-controller/src/templates/minio_configmap.yaml.j2 Optionally injects S3 region into the artifact repository config.
charms/argo-controller/tests/unit/test_charm.py Updates unit tests for optional storage relations, adds conflict-detector and endpoint parsing test.
charms/argo-controller/tests/integration/test_charm_s3.py New integration suite covering s3-integrator:s3-credentials.
charms/argo-controller/tests/integration/test_charm_object_storage.py New integration suite covering minio:object-storage.
charms/argo-controller/tests/integration/charms_dependencies.py Adds S3_INTEGRATOR test dependency spec.
charms/argo-controller/tox.ini Adds a new integration tox env and adjusts integration test targets.
charms/argo-controller/pyproject.toml Bumps chisme version and adds a new dependency.
.github/workflows/ci.yaml Runs both integration suites via a matrix strategy.
.gitignore Ignores coverage.xml.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread charms/argo-controller/src/charm.py
Comment thread charms/argo-controller/tests/unit/test_charm.py Outdated
Comment thread charms/argo-controller/metadata.yaml
mvlassis and others added 6 commits June 19, 2026 10:44
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Manos Vlassis <57320708+mvlassis@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Manos Vlassis <57320708+mvlassis@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 12 changed files in this pull request and generated 2 comments.

Comment thread charms/argo-controller/src/charm.py
Comment thread charms/argo-controller/tests/unit/test_charm.py
mvlassis and others added 2 commits June 19, 2026 11:58
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Manos Vlassis <57320708+mvlassis@users.noreply.github.com>

@NohaIhab NohaIhab left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you @mvlassis, did a first pass

Comment thread charms/argo-controller/src/charm.py
Comment thread charms/argo-controller/src/charm.py
Comment thread charms/argo-controller/src/charm.py Outdated
Comment thread charms/argo-controller/src/charm.py Outdated
Comment thread charms/argo-controller/src/charm.py Outdated
Comment thread charms/argo-controller/metadata.yaml
Comment thread charms/argo-controller/tests/integration/test_charm_s3.py
Comment thread charms/argo-controller/tests/integration/test_charm_s3.py
@mvlassis mvlassis requested a review from NohaIhab June 23, 2026 12:34
@mvlassis mvlassis merged commit fda60a5 into main Jun 24, 2026
12 checks passed
@mvlassis mvlassis deleted the kf-8701-s3 branch June 24, 2026 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add s3 interface to relate with s3-integrator

5 participants