From be5498d3df8b818af58e492be154fa43a0fb4d20 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Fri, 23 Feb 2024 16:01:00 +0100 Subject: [PATCH 1/5] test: trust kubeflow-volumes This charm now requires to be trusted at deployment time. --- tests/test_bundle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_bundle.py b/tests/test_bundle.py index 052a5047..42a78d22 100644 --- a/tests/test_bundle.py +++ b/tests/test_bundle.py @@ -100,7 +100,7 @@ async def test_ingress_relation(ops_test: OpsTest): TODO (https://github.com/canonical/istio-operators/issues/259): Change this from using a specific charm that implements ingress's requirer interface to a generic charm """ - await ops_test.model.deploy(KUBEFLOW_VOLUMES, channel="latest/edge") + await ops_test.model.deploy(KUBEFLOW_VOLUMES, channel="latest/edge", trust=True) await ops_test.model.add_relation(f"{ISTIO_PILOT}:ingress", f"{KUBEFLOW_VOLUMES}:ingress") From a1a50e3f9e0261cf2b50f9c16c065254e4cd52d8 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Fri, 23 Feb 2024 12:56:08 -0500 Subject: [PATCH 2/5] set minimum pip version for istio-gateway --- charms/istio-gateway/charmcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charms/istio-gateway/charmcraft.yaml b/charms/istio-gateway/charmcraft.yaml index 0cfc6685..cf6ff072 100644 --- a/charms/istio-gateway/charmcraft.yaml +++ b/charms/istio-gateway/charmcraft.yaml @@ -8,4 +8,4 @@ bases: channel: '20.04' parts: charm: - charm-python-packages: [setuptools, pip] + charm-python-packages: [setuptools, pip>=23.2.1] From 2dad60c515e9c32791ea8d95b91809bc7b7a8f2d Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Fri, 23 Feb 2024 13:19:15 -0500 Subject: [PATCH 3/5] pin charmcraft to v2.2 --- .github/workflows/integrate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index e01ed571..345beac8 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -63,7 +63,7 @@ jobs: channel: ${{ matrix.microk8s-versions }} microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49" juju-channel: 3.1/stable - charmcraft-channel: latest/candidate + charmcraft-channel: 2.2/stable - name: Run integration tests run: | @@ -130,7 +130,7 @@ jobs: channel: ${{ matrix.microk8s-versions }} microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49" juju-channel: 3.1/stable - charmcraft-channel: latest/candidate + charmcraft-channel: 2.2/stable - name: Run observability integration tests run: | From 951c48bfd10189c79eb275de958836f363053ed6 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Fri, 23 Feb 2024 14:17:53 -0500 Subject: [PATCH 4/5] Revert "pin charmcraft to v2.2" This reverts commit 2dad60c515e9c32791ea8d95b91809bc7b7a8f2d. --- .github/workflows/integrate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 345beac8..e01ed571 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -63,7 +63,7 @@ jobs: channel: ${{ matrix.microk8s-versions }} microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49" juju-channel: 3.1/stable - charmcraft-channel: 2.2/stable + charmcraft-channel: latest/candidate - name: Run integration tests run: | @@ -130,7 +130,7 @@ jobs: channel: ${{ matrix.microk8s-versions }} microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49" juju-channel: 3.1/stable - charmcraft-channel: 2.2/stable + charmcraft-channel: latest/candidate - name: Run observability integration tests run: | From 8af99cc2440b040a7efacbe3b3e11feff647d373 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Fri, 23 Feb 2024 14:18:43 -0500 Subject: [PATCH 5/5] Revert "set minimum pip version for istio-gateway" This reverts commit a1a50e3f9e0261cf2b50f9c16c065254e4cd52d8. --- charms/istio-gateway/charmcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charms/istio-gateway/charmcraft.yaml b/charms/istio-gateway/charmcraft.yaml index cf6ff072..0cfc6685 100644 --- a/charms/istio-gateway/charmcraft.yaml +++ b/charms/istio-gateway/charmcraft.yaml @@ -8,4 +8,4 @@ bases: channel: '20.04' parts: charm: - charm-python-packages: [setuptools, pip>=23.2.1] + charm-python-packages: [setuptools, pip]