Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: canonical/kfp-operators
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c33c2e35914c3d991aabcde6cab04096bb7242b
Choose a base ref
..
head repository: canonical/kfp-operators
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bceaa7c6f41889bcbaa8ba66c5fa8fcea8a37006
Choose a head ref
5 changes: 1 addition & 4 deletions .github/workflows/integrate.yaml
View file
Original file line number Diff line number Diff line change
@@ -141,10 +141,7 @@ jobs:
run: |
# Requires the model to be called kubeflow due to kfp-viewer
juju add-model kubeflow
# Run integration tests against the 1.7 generic install bundle definition
# Using destructive mode because of https://github.com/canonical/charmcraft/issues/1132
# and https://github.com/canonical/charmcraft/issues/1138
sg snap_microk8s -c "tox -e bundle-integration-${{ matrix.sdk }} -- --model kubeflow --bundle=./tests/integration/bundles/kfp_latest_edge.yaml.j2 --destructive-mode"
sg snap_microk8s -c "tox -e bundle-integration-${{ matrix.sdk }} -- --model kubeflow --bundle=./tests/integration/bundles/kfp_latest_edge.yaml.j2"
- name: Get all
run: kubectl get all -A
4 changes: 4 additions & 0 deletions charms/kfp-api/charmcraft.yaml
View file
Original file line number Diff line number Diff line change
@@ -11,3 +11,7 @@ bases:
parts:
charm:
charm-python-packages: [setuptools, pip] # Fixes install of some packages
# Install jinja2 (a dependency of charmed-kubeflow-chisme) from binary to avoid build-time issues
# See https://github.com/canonical/bundle-kubeflow/issues/883
# Remove when https://github.com/canonical/charmcraft/issues/1664 is fixed
charm-binary-python-packages: [jinja2]
15 changes: 12 additions & 3 deletions charms/kfp-metadata-writer/charmcraft.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Learn more about charmcraft.yaml configuration at:
# https://juju.is/docs/sdk/charmcraft-config
type: "charm"
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.

type: charm
bases:
- build-on:
- name: "ubuntu"
@@ -10,4 +11,12 @@ bases:
channel: "20.04"
parts:
charm:
# These build-packages are defined here because pydantic needs them
# at build time. As long as pydantic is listed in requirements.in, this
# list cannot be removed/changed.
build-packages: [cargo, rustc, pkg-config, libffi-dev, libssl-dev]
charm-python-packages: [setuptools, pip] # Fixes install of some packages
# Install jinja2 (a dependency of charmed-kubeflow-chisme) from binary to avoid build-time issues
# See https://github.com/canonical/bundle-kubeflow/issues/883
# Remove when https://github.com/canonical/charmcraft/issues/1664 is fixed
charm-binary-python-packages: [jinja2]
Loading