ci: update juju to 3.1 and microk8s to 1.25 (#197)

* ci: update juju to 3.1 and microk8s to 1.25
canonical · Sep 8, 2023 · e28df37 · e28df37
1 parent 328b5f7
commit e28df37
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 35 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -67,15 +67,13 @@ jobs:
     - name: Setup operator environment
       uses: charmed-kubernetes/actions-operator@1.1.0
       with:
-        juju-channel: "2.9/stable"
+        juju-channel: "3.1/stable"
         provider: microk8s
-        channel: 1.24/stable
-        # Pinned until this bug is resolved: https://bugs.launchpad.net/juju/+bug/1992833
-        bootstrap-options: "--agent-version=2.9.34"
+        channel: 1.25-strict/stable
         microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
 
     - name: Run integration tests
-      run: sg microk8s -c "tox -vve integration -- --model testing"
+      run: sg snap_microk8s -c "tox -vve integration -- --model testing"
 
     # On failure, capture debugging resources      
     - name: Get all

diff --git a/requirements-integration.in b/requirements-integration.in
@@ -1,6 +1,7 @@
 aiohttp
 jinja2
-juju==2.9.44
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 minio
 mlflow
 pytest-operator

diff --git a/requirements-integration.txt b/requirements-integration.txt
@@ -8,13 +8,13 @@ aiohttp==3.8.5
     # via -r requirements-integration.in
 aiosignal==1.3.1
     # via aiohttp
-alembic==1.11.2
+alembic==1.12.0
     # via mlflow
 anyio==3.7.1
     # via
     #   -r requirements.txt
     #   httpcore
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 async-timeout==4.0.3
     # via aiohttp
@@ -57,7 +57,7 @@ charset-normalizer==3.2.0
     #   -r requirements.txt
     #   aiohttp
     #   requests
-click==8.1.6
+click==8.1.7
     # via
     #   databricks-cli
     #   flask
@@ -91,23 +91,23 @@ exceptiongroup==1.1.2
     #   pytest
 executing==1.2.0
     # via stack-data
-flask==2.3.2
+flask==2.3.3
     # via mlflow
-fonttools==4.42.0
+fonttools==4.42.1
     # via matplotlib
 frozenlist==1.4.0
     # via
     #   aiohttp
     #   aiosignal
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via mlflow
 google-auth==2.22.0
     # via kubernetes
 greenlet==2.0.2
     # via sqlalchemy
-gunicorn==20.1.0
+gunicorn==21.2.0
     # via mlflow
 h11==0.14.0
     # via
@@ -121,6 +121,8 @@ httpx==0.24.1
     # via
     #   -r requirements.txt
     #   lightkube
+hvac==1.2.0
+    # via juju
 idna==3.4
     # via
     #   -r requirements.txt
@@ -169,13 +171,11 @@ jsonschema==4.17.3
     # via
     #   -r requirements.txt
     #   serialized-data-interface
-juju==2.9.44.0
+juju==3.2.2
     # via
     #   -r requirements-integration.in
     #   pytest-operator
-jujubundlelib==0.5.7
-    # via theblues
-kiwisolver==1.4.4
+kiwisolver==1.4.5
     # via matplotlib
 kubernetes==27.2.0
     # via juju
@@ -188,9 +188,7 @@ lightkube-models==1.27.1.4
     #   -r requirements.txt
     #   lightkube
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 mako==1.2.4
     # via alembic
 markdown==3.4.4
@@ -207,7 +205,7 @@ matplotlib-inline==0.1.6
     # via ipython
 minio==7.1.16
     # via -r requirements-integration.in
-mlflow==2.5.0
+mlflow==2.6.0
     # via -r requirements-integration.in
 multidict==6.0.4
     # via
@@ -243,6 +241,7 @@ ordered-set==4.1.0
 packaging==23.1
     # via
     #   docker
+    #   gunicorn
     #   matplotlib
     #   mlflow
     #   pytest
@@ -262,7 +261,7 @@ pkgutil-resolve-name==1.3.10
     # via
     #   -r requirements.txt
     #   jsonschema
-pluggy==1.2.0
+pluggy==1.3.0
     # via pytest
 prompt-toolkit==3.0.39
     # via ipython
@@ -287,6 +286,8 @@ pycparser==2.21
     # via cffi
 pygments==2.16.1
     # via ipython
+pyhcl==0.4.5
+    # via hvac
 pyjwt==2.8.0
     # via databricks-cli
 pymacaroons==0.13.0
@@ -306,13 +307,13 @@ pyrsistent==0.19.3
     # via
     #   -r requirements.txt
     #   jsonschema
-pytest==7.4.0
+pytest==7.4.2
     # via
     #   pytest-asyncio
     #   pytest-operator
 pytest-asyncio==0.21.1
     # via pytest-operator
-pytest-operator==0.28.0
+pytest-operator==0.29.0
     # via -r requirements-integration.in
 python-dateutil==2.8.2
     # via
@@ -321,7 +322,7 @@ python-dateutil==2.8.2
     #   kubernetes
     #   matplotlib
     #   pandas
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   mlflow
     #   pandas
@@ -330,7 +331,6 @@ pyyaml==6.0.1
     # via
     #   -r requirements.txt
     #   juju
-    #   jujubundlelib
     #   kubernetes
     #   lightkube
     #   mlflow
@@ -345,12 +345,12 @@ requests==2.31.0
     #   -r requirements.txt
     #   databricks-cli
     #   docker
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   mlflow
     #   requests-oauthlib
     #   serialized-data-interface
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
@@ -397,7 +397,7 @@ sniffio==1.3.0
     #   anyio
     #   httpcore
     #   httpx
-sqlalchemy==2.0.19
+sqlalchemy==2.0.20
     # via
     #   alembic
     #   mlflow
@@ -411,8 +411,6 @@ tenacity==8.2.2
     # via
     #   -r requirements.txt
     #   charmed-kubeflow-chisme
-theblues==0.5.2
-    # via juju
 threadpoolctl==3.2.0
     # via scikit-learn
 tomli==2.0.1
@@ -453,9 +451,9 @@ websocket-client==1.6.1
     #   docker
     #   kubernetes
     #   ops
-websockets==7.0
+websockets==8.1
     # via juju
-werkzeug==2.3.6
+werkzeug==2.3.7
     # via flask
 yarl==1.9.2
     # via aiohttp
@@ -464,6 +462,3 @@ zipp==3.16.2
     #   -r requirements.txt
     #   importlib-metadata
     #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools