ci: update juju to 3.1 and microk8s to 1.25

canonical · Sep 8, 2023 · a79a8ce · a79a8ce
1 parent b6b0931
commit a79a8ce
Show file tree

Hide file tree

Showing 17 changed files with 177 additions and 214 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -92,12 +92,12 @@ jobs:
         uses: charmed-kubernetes/actions-operator@main
         with:
           provider: microk8s
-          channel: 1.24/stable
-          juju-channel: 2.9/stable
+          channel: 1.25-strict/stable
+          juju-channel: 3.1/stable
           charmcraft-channel: latest/candidate
 
       - run: |
-          sg microk8s -c "tox -e ${{ matrix.charm }}-integration"
+          tox -e ${{ matrix.charm }}-integration
 
       - name: Collect charm debug artifacts
         uses: canonical/kubeflow-ci/actions/dump-charm-debug-artifacts@main
@@ -130,16 +130,11 @@ jobs:
         uses: charmed-kubernetes/actions-operator@main
         with:
           provider: microk8s
-          channel: 1.24/stable
-          juju-channel: 2.9/stable
+          channel: 1.25-strict/stable
+          juju-channel: 3.1/stable
           charmcraft-channel: latest/candidate
           microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49"
 
-      # TODO: Remove once https://bugs.launchpad.net/juju/+bug/2024897 is fixed
-      - name: Refresh Juju snap
-        run: |
-          sudo snap refresh juju --revision 22345
-
       - name: Run test
         run: |
           # Requires the model to be called kubeflow due to kfp-viewer

diff --git a/charms/kfp-api/requirements-integration.in b/charms/kfp-api/requirements-integration.in
@@ -1,6 +1,5 @@
-# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
-# Note: 3.0 is not being maintained anymore
-juju<3.0
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 pytest-operator
 selenium
 selenium-wire

diff --git a/charms/kfp-api/requirements-integration.txt b/charms/kfp-api/requirements-integration.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements-integration.in
 #
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 attrs==23.1.0
     # via
@@ -16,7 +16,7 @@ bcrypt==4.0.1
     # via paramiko
 blinker==1.6.2
     # via selenium-wire
-brotli==1.0.9
+brotli==1.1.0
     # via selenium-wire
 cachetools==5.3.1
     # via google-auth
@@ -40,7 +40,7 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
     # via
     #   pytest
     #   trio
@@ -55,6 +55,8 @@ h2==4.1.0
     # via selenium-wire
 hpack==4.0.0
     # via h2
+hvac==1.2.0
+    # via juju
 hyperframe==6.0.1
     # via
     #   h2
@@ -73,20 +75,16 @@ jedi==0.19.0
     # via ipython
 jinja2==3.1.2
     # via pytest-operator
-juju==2.9.44.1
+juju==3.2.2
     # via
     #   -r requirements-integration.in
     #   pytest-operator
-jujubundlelib==0.5.7
-    # via theblues
 kaitaistruct==0.10
     # via selenium-wire
 kubernetes==27.2.0
     # via juju
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -109,7 +107,7 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-pluggy==1.2.0
+pluggy==1.3.0
     # via pytest
 prompt-toolkit==3.0.39
     # via ipython
@@ -131,6 +129,8 @@ pycparser==2.21
     # via cffi
 pygments==2.16.1
     # via ipython
+pyhcl==0.4.5
+    # via hvac
 pymacaroons==0.13.0
     # via macaroonbakery
 pynacl==1.5.0
@@ -150,35 +150,34 @@ pysocks==1.7.1
     # via
     #   selenium-wire
     #   urllib3
-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 kubernetes
-pytz==2023.3
+pytz==2023.3.post1
     # via pyrfc3339
 pyyaml==6.0.1
     # via
     #   juju
-    #   jujubundlelib
     #   kubernetes
     #   pytest-operator
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
     # via google-auth
-selenium==4.11.2
+selenium==4.12.0
     # via
     #   -r requirements-integration.in
     #   selenium-wire
@@ -199,10 +198,8 @@ sortedcontainers==2.4.0
     # via trio
 stack-data==0.6.2
     # via ipython
-tenacity==8.2.2
+tenacity==8.2.3
     # via -r requirements-integration.in
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -217,7 +214,7 @@ trio==0.22.2
     # via
     #   selenium
     #   trio-websocket
-trio-websocket==0.10.3
+trio-websocket==0.10.4
     # via selenium
 typing-extensions==4.7.1
     # via
@@ -232,9 +229,9 @@ urllib3[socks]==2.0.4
     #   selenium
 wcwidth==0.2.6
     # via prompt-toolkit
-websocket-client==1.6.1
+websocket-client==1.6.2
     # via kubernetes
-websockets==7.0
+websockets==8.1
     # via juju
 wsproto==1.2.0
     # via

diff --git a/charms/kfp-persistence/requirements-integration.in b/charms/kfp-persistence/requirements-integration.in
@@ -1,6 +1,5 @@
-# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
-# Note: 3.0 is not being maintained anymore
-juju<3.0
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 pytest-operator
 selenium
 selenium-wire

diff --git a/charms/kfp-persistence/requirements-integration.txt b/charms/kfp-persistence/requirements-integration.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements-integration.in
 #
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 attrs==23.1.0
     # via
@@ -16,7 +16,7 @@ bcrypt==4.0.1
     # via paramiko
 blinker==1.6.2
     # via selenium-wire
-brotli==1.0.9
+brotli==1.1.0
     # via selenium-wire
 cachetools==5.3.1
     # via google-auth
@@ -40,7 +40,7 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
     # via
     #   pytest
     #   trio
@@ -55,6 +55,8 @@ h2==4.1.0
     # via selenium-wire
 hpack==4.0.0
     # via h2
+hvac==1.2.0
+    # via juju
 hyperframe==6.0.1
     # via
     #   h2
@@ -73,20 +75,16 @@ jedi==0.19.0
     # via ipython
 jinja2==3.1.2
     # via pytest-operator
-juju==2.9.44.1
+juju==3.2.2
     # via
     #   -r requirements-integration.in
     #   pytest-operator
-jujubundlelib==0.5.7
-    # via theblues
 kaitaistruct==0.10
     # via selenium-wire
 kubernetes==27.2.0
     # via juju
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -109,7 +107,7 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-pluggy==1.2.0
+pluggy==1.3.0
     # via pytest
 prompt-toolkit==3.0.39
     # via ipython
@@ -131,6 +129,8 @@ pycparser==2.21
     # via cffi
 pygments==2.16.1
     # via ipython
+pyhcl==0.4.5
+    # via hvac
 pymacaroons==0.13.0
     # via macaroonbakery
 pynacl==1.5.0
@@ -150,35 +150,34 @@ pysocks==1.7.1
     # via
     #   selenium-wire
     #   urllib3
-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 kubernetes
-pytz==2023.3
+pytz==2023.3.post1
     # via pyrfc3339
 pyyaml==6.0.1
     # via
     #   juju
-    #   jujubundlelib
     #   kubernetes
     #   pytest-operator
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
     # via google-auth
-selenium==4.11.2
+selenium==4.12.0
     # via
     #   -r requirements-integration.in
     #   selenium-wire
@@ -199,10 +198,8 @@ sortedcontainers==2.4.0
     # via trio
 stack-data==0.6.2
     # via ipython
-tenacity==8.2.2
+tenacity==8.2.3
     # via -r requirements-integration.in
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -217,7 +214,7 @@ trio==0.22.2
     # via
     #   selenium
     #   trio-websocket
-trio-websocket==0.10.3
+trio-websocket==0.10.4
     # via selenium
 typing-extensions==4.7.1
     # via
@@ -232,9 +229,9 @@ urllib3[socks]==2.0.4
     #   selenium
 wcwidth==0.2.6
     # via prompt-toolkit
-websocket-client==1.6.1
+websocket-client==1.6.2
     # via kubernetes
-websockets==7.0
+websockets==8.1
     # via juju
 wsproto==1.2.0
     # via

diff --git a/charms/kfp-profile-controller/requirements-integration.in b/charms/kfp-profile-controller/requirements-integration.in
@@ -1,6 +1,5 @@
-# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
-# Note: 3.0 is not being maintained anymore
-juju<3.0
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 lightkube
 pytest-operator
 selenium