build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1 (#98)

* build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1

Part of canonical/bundle-kubeflow#648

* tests: bump istio-pilot 1.5->1.16 stable

.github/workflows/integrate.yaml

@@ -54,6 +54,7 @@ jobs:
         with:
           provider: microk8s
           channel: 1.24/stable
+          juju-channel: 2.9/stable
           charmcraft-channel: latest/candidate
 
       - name: Test

requirements-integration.in

@@ -1,6 +1,7 @@
 aiohttp
 jinja2
-juju<3.1
+# Pinning to <3.0 due to compatibility with the 2.9 controller version and 3.0 not being maintained anymore
+juju<3.0
 pytest-operator
 requests
 -r requirements.txt

requirements-integration.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --resolver=backtracking ./requirements-integration.in
+#    pip-compile ./requirements-integration.in
 #
 aiohttp==3.8.3
     # via -r ./requirements-integration.in
@@ -60,6 +60,10 @@ idna==2.10
     #   -r ./requirements.txt
     #   requests
     #   yarl
+importlib-resources==6.0.0
+    # via
+    #   -r ./requirements.txt
+    #   jsonschema
 iniconfig==1.1.1
     # via pytest
 ipdb==0.13.9
@@ -72,11 +76,11 @@ jinja2==3.1.2
     # via
     #   -r ./requirements-integration.in
     #   pytest-operator
-jsonschema==3.2.0
+jsonschema==4.17.3
     # via
     #   -r ./requirements.txt
     #   serialized-data-interface
-juju==3.0.4
+juju==2.9.44.0
     # via
     #   -r ./requirements-integration.in
     #   pytest-operator
@@ -116,6 +120,10 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
+pkgutil-resolve-name==1.3.10
+    # via
+    #   -r ./requirements.txt
+    #   jsonschema
 pluggy==1.0.0
     # via pytest
 prompt-toolkit==3.0.36
@@ -164,7 +172,7 @@ python-dateutil==2.8.2
     # via kubernetes
 pytz==2022.6
     # via pyrfc3339
-pyyaml==5.4
+pyyaml==6.0.1
     # via
     #   -r ./requirements.txt
     #   juju
@@ -186,14 +194,12 @@ requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
     # via google-auth
-serialized-data-interface==0.3.5
+serialized-data-interface==0.3.6
     # via -r ./requirements.txt
 six==1.16.0
     # via
-    #   -r ./requirements.txt
     #   asttokens
     #   google-auth
-    #   jsonschema
     #   kubernetes
     #   macaroonbakery
     #   paramiko
@@ -230,6 +236,10 @@ websockets==7.0
     # via juju
 yarl==1.8.2
     # via aiohttp
+zipp==3.16.2
+    # via
+    #   -r ./requirements.txt
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements-unit.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --resolver=backtracking ./requirements-unit.in
+#    pip-compile ./requirements-unit.in
 #
 attrs==22.1.0
     # via
@@ -25,9 +25,13 @@ idna==2.10
     # via
     #   -r ./requirements.txt
     #   requests
+importlib-resources==6.0.0
+    # via
+    #   -r ./requirements.txt
+    #   jsonschema
 iniconfig==1.1.1
     # via pytest
-jsonschema==3.2.0
+jsonschema==4.17.3
     # via
     #   -r ./requirements.txt
     #   serialized-data-interface
@@ -39,6 +43,10 @@ ops==1.5.4
     #   serialized-data-interface
 packaging==22.0
     # via pytest
+pkgutil-resolve-name==1.3.10
+    # via
+    #   -r ./requirements.txt
+    #   jsonschema
 pluggy==1.0.0
     # via pytest
 pyrsistent==0.19.2
@@ -54,7 +62,7 @@ pytest-lazy-fixture==0.6.3
     # via -r ./requirements-unit.in
 pytest-mock==3.10.0
     # via -r ./requirements-unit.in
-pyyaml==5.4
+pyyaml==6.0.1
     # via
     #   -r ./requirements.txt
     #   ops
@@ -63,18 +71,15 @@ requests==2.25.0
     # via
     #   -r ./requirements.txt
     #   serialized-data-interface
-serialized-data-interface==0.3.5
+serialized-data-interface==0.3.6
     # via -r ./requirements.txt
-six==1.16.0
-    # via
-    #   -r ./requirements.txt
-    #   jsonschema
 tomli==2.0.1
     # via pytest
 urllib3==1.26.13
     # via
     #   -r ./requirements.txt
     #   requests
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+zipp==3.16.2
+    # via
+    #   -r ./requirements.txt
+    #   importlib-resources

requirements.in

@@ -3,4 +3,6 @@
 
 ops
 oci-image
+# oidc-gatekeeper's current implementation is not compatible
+# with SDI>0.3.
 serialized-data-interface<0.4

requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --resolver=backtracking ./requirements.in
+#    pip-compile ./requirements.in
 #
 attrs==22.1.0
     # via jsonschema
@@ -12,28 +12,29 @@ chardet==3.0.4
     # via requests
 idna==2.10
     # via requests
-jsonschema==3.2.0
+importlib-resources==6.0.0
+    # via jsonschema
+jsonschema==4.17.3
     # via serialized-data-interface
 oci-image==1.0.0
     # via -r ./requirements.in
 ops==1.5.4
     # via
     #   -r ./requirements.in
     #   serialized-data-interface
+pkgutil-resolve-name==1.3.10
+    # via jsonschema
 pyrsistent==0.19.2
     # via jsonschema
-pyyaml==5.4
+pyyaml==6.0.1
     # via
     #   ops
     #   serialized-data-interface
 requests==2.25.0
     # via serialized-data-interface
-serialized-data-interface==0.3.5
+serialized-data-interface==0.3.6
     # via -r ./requirements.in
-six==1.16.0
-    # via jsonschema
 urllib3==1.26.13
     # via requests
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+zipp==3.16.2
+    # via importlib-resources

tests/integration/test_charm.py

@@ -38,16 +38,18 @@ async def test_build_and_deploy(ops_test: OpsTest):
 
 @pytest.mark.abort_on_fail
 async def test_relations(ops_test: OpsTest):
-    await ops_test.model.deploy(ISTIO_PILOT, channel="1.5/stable")
+    await ops_test.model.deploy(ISTIO_PILOT, channel="1.16/stable", trust=True)
     await ops_test.model.deploy(DEX_AUTH, channel="latest/edge", trust=True)
     await ops_test.model.add_relation(ISTIO_PILOT, DEX_AUTH)
     await ops_test.model.add_relation(f"{ISTIO_PILOT}:ingress", f"{APP_NAME}:ingress")
     await ops_test.model.add_relation(f"{ISTIO_PILOT}:ingress-auth", f"{APP_NAME}:ingress-auth")
 
+    # Not raising on blocked will allow istio-pilot to be deployed
+    # without istio-gateway and provide oidc with the data it needs.
     await ops_test.model.wait_for_idle(
         [APP_NAME, ISTIO_PILOT, DEX_AUTH],
         status="active",
-        raise_on_blocked=True,
+        raise_on_blocked=False,
         raise_on_error=True,
         timeout=600,
     )