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

* ci: update juju to 3.1 and microk8s to 1.25
canonical · Sep 8, 2023 · fbde627 · fbde627
1 parent 10f75f9
commit fbde627
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 75 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -69,17 +69,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
 
-      # TODO: Remove once the actions-operator does this automatically
-      - name: Configure kubectl
-        run: |
-          sg microk8s -c "microk8s config > ~/.kube/config"
-
       - run: |
-          sg microk8s -c "tox -e ${{ matrix.charm }}-integration"
+          sg snap_microk8s -c "tox -e ${{ matrix.charm }}-integration"
 
       # Collect debug logs if failed
       - name: Dump Juju/k8s logs on failure
@@ -114,15 +109,15 @@ 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
           microk8s-addons: "dns storage rbac"
 
       - name: Run test
         run: |
           # Requires the model to be called kubeflow due to kfp-viewer
           juju add-model kubeflow --config default-series=focal
-          tox -e bundle-integration -- --model kubeflow
+          sg snap_microk8s -c "tox -e bundle-integration -- --model kubeflow"
 
       - name: Get pod statuses
         run: kubectl get all -A

diff --git a/charms/katib-controller/requirements-integration.in b/charms/katib-controller/requirements-integration.in
@@ -1,5 +1,5 @@
-# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
-juju<3.0
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 lightkube
 pytest
 pytest-operator

diff --git a/charms/katib-controller/requirements-integration.txt b/charms/katib-controller/requirements-integration.txt
@@ -4,9 +4,9 @@
 #
 #    pip-compile requirements-integration.in
 #
-anyio==3.7.1
+anyio==4.0.0
     # via httpcore
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 backcall==0.2.0
     # via ipython
@@ -46,6 +46,8 @@ httpcore==0.17.3
     # via httpx
 httpx==0.24.1
     # via lightkube
+hvac==1.2.0
+    # via juju
 idna==3.4
     # via
     #   anyio
@@ -61,22 +63,18 @@ jedi==0.19.0
     # via ipython
 jinja2==3.1.2
     # via pytest-operator
-juju==2.9.44.0
+juju==3.2.2
     # via
     #   -r requirements-integration.in
     #   pytest-operator
-jujubundlelib==0.5.7
-    # via theblues
 kubernetes==27.2.0
     # via juju
 lightkube==0.14.0
     # via -r requirements-integration.in
-lightkube-models==1.27.1.4
+lightkube-models==1.28.1.4
     # via lightkube
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -97,7 +95,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
@@ -118,6 +116,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
@@ -129,33 +129,32 @@ pyrfc3339==1.1
     # via
     #   juju
     #   macaroonbakery
-pytest==7.4.0
+pytest==7.4.2
     # via
     #   -r requirements-integration.in
     #   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
     #   -r requirements-integration.in
     #   juju
-    #   jujubundlelib
     #   kubernetes
     #   lightkube
     #   pytest-operator
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
@@ -176,8 +175,6 @@ sniffio==1.3.0
     #   httpx
 stack-data==0.6.2
     # via ipython
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -201,7 +198,7 @@ urllib3==1.26.16
     #   requests
 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
diff --git a/charms/katib-db-manager/requirements-integration.in b/charms/katib-db-manager/requirements-integration.in
@@ -1,6 +1,6 @@
 charmed-kubeflow-chisme
-# Pinning to <3.0 due to compatibility with the 2.9 controller version and 3.0 not being maintained anymore
-juju<3.0
+# Pinning to <4.0 due to compatibility with the 3.1 controller version
+juju<4.0
 ops
 pytest
 pytest-operator

diff --git a/charms/katib-db-manager/requirements-integration.txt b/charms/katib-db-manager/requirements-integration.txt
@@ -4,9 +4,9 @@
 #
 #    pip-compile requirements-integration.in
 #
-anyio==3.7.1
+anyio==4.0.0
     # via httpcore
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 attrs==23.1.0
     # via jsonschema
@@ -52,6 +52,8 @@ httpcore==0.17.3
     # via httpx
 httpx==0.24.1
     # via lightkube
+hvac==1.2.0
+    # via juju
 idna==3.4
     # via
     #   anyio
@@ -73,22 +75,18 @@ jinja2==3.1.2
     #   pytest-operator
 jsonschema==4.17.3
     # via 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
 kubernetes==27.2.0
     # via juju
 lightkube==0.14.0
     # via charmed-kubeflow-chisme
-lightkube-models==1.27.1.4
+lightkube-models==1.28.1.4
     # via lightkube
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -99,7 +97,7 @@ oauthlib==3.2.2
     # via
     #   kubernetes
     #   requests-oauthlib
-ops==2.5.1
+ops==2.6.0
     # via
     #   -r requirements-integration.in
     #   charmed-kubeflow-chisme
@@ -118,7 +116,7 @@ pickleshare==0.7.5
     # via ipython
 pkgutil-resolve-name==1.3.10
     # via jsonschema
-pluggy==1.2.0
+pluggy==1.3.0
     # via pytest
 prompt-toolkit==3.0.39
     # via ipython
@@ -139,6 +137,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
@@ -152,36 +152,35 @@ pyrfc3339==1.1
     #   macaroonbakery
 pyrsistent==0.19.3
     # via jsonschema
-pytest==7.4.0
+pytest==7.4.2
     # via
     #   -r requirements-integration.in
     #   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
     #   -r requirements-integration.in
     #   juju
-    #   jujubundlelib
     #   kubernetes
     #   lightkube
     #   ops
     #   pytest-operator
     #   serialized-data-interface
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
     #   serialized-data-interface
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
@@ -210,8 +209,6 @@ stack-data==0.6.2
     # via ipython
 tenacity==8.2.3
     # via charmed-kubeflow-chisme
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -235,11 +232,11 @@ urllib3==1.26.16
     #   requests
 wcwidth==0.2.6
     # via prompt-toolkit
-websocket-client==1.6.1
+websocket-client==1.6.2
     # via
     #   kubernetes
     #   ops
-websockets==7.0
+websockets==8.1
     # via juju
 zipp==3.16.2
     # via importlib-resources
diff --git a/requirements-integration.in b/requirements-integration.in
@@ -1,7 +1,7 @@
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
-# Pinning to <3.0 due to compatibility with the 2.9 controller version and 3.0 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
 pytest-operator