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

backport: Make charm's images configurable #91

Merged
merged 3 commits into from
Sep 27, 2023

Conversation

orfeas-k
Copy link
Contributor

@orfeas-k orfeas-k commented Sep 26, 2023

This PR backports changes from main branch in order to make the charm's image configurable. This cherry-picks the following #68, #79 and #83. During cherry-picking those, the following were done:

  • Resolved during commit e1850b8 since in track/2.0 there was already a get-images.sh script that was different from the one in the commit (kept the incoming change).
  • Resolved during commit 5d36799 since in track/2.0 there was an extra comment in metadata.yaml and the image was hardcoded in charm.py (kept for both the incoming change). Also, I edited config.yaml in order to not introduce a different image than the one the charm was using.

Closes #90

@orfeas-k orfeas-k requested a review from a team as a code owner September 26, 2023 10:33
@orfeas-k orfeas-k changed the title Backport: Make charm's images configurable backport: Make charm's images configurable Sep 26, 2023
Ivan Chvets and others added 3 commits September 26, 2023 14:36
Summary of changes:
- Added script that retrieves image managed by charm.
* feat: get images on main
canonical/bundle-kubeflow#679

Summary of changes:
- Added script that produces list of container images managed by charm in this repository. Image list is a dynamic list.
- Update tools/get-images.sh
---------
Co-authored-by: Phoevos Kalemkeris <phoevos.kalemkeris@canonical.com>
Expose the metacontroller image in config.yaml, so that it can be set
either pre or post deployment. This also ensures that the image is
always pulled from the specified source and not a private registry,
which the metacontroller StatefulSet doesn't have permission to access.

Signed-off-by: Phoevos Kalemkeris <phoevos.kalemkeris@canonical.com>
@orfeas-k orfeas-k force-pushed the kf-2303-backport-airgap-support branch from 9da0a64 to 5e627c2 Compare September 26, 2023 11:36
Copy link
Contributor

@i-chvets i-chvets left a comment

Choose a reason for hiding this comment

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

Approved.
Tested with different metacontroller image:

$ juju deploy ./metacontroller-operator_ubuntu-20.04-amd64.charm metacontroller --config="metacontroller-image=docker.io/metacontrollerio/metacontroller:v2.1.0" --trust
  Normal  Scheduled  51s   default-scheduler  Successfully assigned test/metacontroller-charm-0 to ic-dev-laptop
  Normal  Pulling    51s   kubelet            Pulling image "docker.io/metacontrollerio/metacontroller:v2.1.0"
  Normal  Pulled     46s   kubelet            Successfully pulled image "docker.io/metacontrollerio/metacontroller:v2.1.0" in 4.829429786s

@orfeas-k orfeas-k merged commit 2834163 into track/2.0 Sep 27, 2023
7 checks passed
@orfeas-k orfeas-k deleted the kf-2303-backport-airgap-support branch September 27, 2023 07:42
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.

3 participants