From 9dd34403e15bfa231882b6be8c963928d52e400d Mon Sep 17 00:00:00 2001
From: Noha Ihab <49988746+NohaIhab@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:17:18 +0300
Subject: [PATCH] ci: update juju to 3.1 and microk8s to 1.25 (#91)

* ci: update juju to 3.1 and microk8s to 1.25
* fix: remove comment on pinned juju < 3.0
Co-authored-by: Phoevos Kalemkeris <phoevos.kalemkeris@canonical.com>
---------

Co-authored-by: Phoevos Kalemkeris <phoevos.kalemkeris@canonical.com>
---
 .github/workflows/integrate.yaml              | 10 ++---
 .../requirements-integration.in               |  5 +--
 .../requirements-integration.txt              | 39 +++++++++----------
 .../requirements-integration.in               |  4 +-
 .../requirements-integration.txt              | 33 +++++++---------
 requirements-integration.in                   |  5 +--
 requirements-integration.txt                  | 33 +++++++---------
 7 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b73e081..e2576d3 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -69,13 +69,13 @@ 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 ingress metallb:10.64.140.43-10.64.140.49
 
       - run: |
-          sg microk8s -c "tox -vve ${{ matrix.charm }}-integration"
+          sg snap_microk8s -c "tox -vve ${{ matrix.charm }}-integration"
 
       # Collect debug logs if failed
       - name: Dump Juju/K8s logs on failure
@@ -95,9 +95,9 @@ jobs:
       uses: charmed-kubernetes/actions-operator@main
       with:
         provider: microk8s
-        channel: 1.24/stable
+        channel: 1.25-strict/stable
         charmcraft-channel: latest/candidate
-        juju-channel: 2.9/stable
+        juju-channel: 3.1/stable
         microk8s-addons: dns hostpath-storage ingress metallb:10.64.140.43-10.64.140.49
 
     - name: Run test
diff --git a/charms/tensorboard-controller/requirements-integration.in b/charms/tensorboard-controller/requirements-integration.in
index 9ebf09d..f8fa8f4 100644
--- a/charms/tensorboard-controller/requirements-integration.in
+++ b/charms/tensorboard-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
 pytest-operator
diff --git a/charms/tensorboard-controller/requirements-integration.txt b/charms/tensorboard-controller/requirements-integration.txt
index bad72ac..74b108a 100644
--- a/charms/tensorboard-controller/requirements-integration.txt
+++ b/charms/tensorboard-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
@@ -32,7 +32,7 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
     # via
     #   anyio
     #   pytest
@@ -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,10 +175,8 @@ sniffio==1.3.0
     #   httpx
 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
@@ -203,7 +200,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/tensorboards-web-app/requirements-integration.in b/charms/tensorboards-web-app/requirements-integration.in
index 64ab7eb..e8a3236 100644
--- a/charms/tensorboards-web-app/requirements-integration.in
+++ b/charms/tensorboards-web-app/requirements-integration.in
@@ -1,6 +1,6 @@
 aiohttp
-# Pinning to <3.0 due to compatibility with the 2.9 controller version. 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
 pytest-operator
 pyyaml
diff --git a/charms/tensorboards-web-app/requirements-integration.txt b/charms/tensorboards-web-app/requirements-integration.txt
index e94b955..66b4899 100644
--- a/charms/tensorboards-web-app/requirements-integration.txt
+++ b/charms/tensorboards-web-app/requirements-integration.txt
@@ -8,7 +8,7 @@ aiohttp==3.8.5
     # via -r requirements-integration.in
 aiosignal==1.3.1
     # via aiohttp
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 async-timeout==4.0.3
     # via aiohttp
@@ -38,7 +38,7 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
     # via pytest
 executing==1.2.0
     # via stack-data
@@ -48,6 +48,8 @@ frozenlist==1.4.0
     #   aiosignal
 google-auth==2.22.0
     # via kubernetes
+hvac==1.2.0
+    # via juju
 idna==3.4
     # via
     #   requests
@@ -62,18 +64,14 @@ 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
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -98,7 +96,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
@@ -119,6 +117,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
@@ -130,32 +130,31 @@ 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
     #   pytest-operator
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
@@ -171,8 +170,6 @@ six==1.16.0
     #   python-dateutil
 stack-data==0.6.2
     # via ipython
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -196,9 +193,9 @@ 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
 yarl==1.9.2
     # via aiohttp
diff --git a/requirements-integration.in b/requirements-integration.in
index e1a657e..09be16e 100644
--- a/requirements-integration.in
+++ b/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
 pytest-operator
 pyyaml
diff --git a/requirements-integration.txt b/requirements-integration.txt
index 959ed4b..8a4ffac 100644
--- a/requirements-integration.txt
+++ b/requirements-integration.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements-integration.in
 #
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 backcall==0.2.0
     # via ipython
@@ -28,12 +28,14 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
     # via pytest
 executing==1.2.0
     # via stack-data
 google-auth==2.22.0
     # via kubernetes
+hvac==1.2.0
+    # via juju
 idna==3.4
     # via requests
 iniconfig==2.0.0
@@ -46,18 +48,14 @@ 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
 macaroonbakery==1.3.1
-    # via
-    #   juju
-    #   theblues
+    # via juju
 markupsafe==2.1.3
     # via jinja2
 matplotlib-inline==0.1.6
@@ -78,7 +76,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
@@ -99,6 +97,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
@@ -110,32 +110,31 @@ 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
     #   pytest-operator
 requests==2.31.0
     # via
+    #   hvac
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
-    #   theblues
 requests-oauthlib==1.3.1
     # via kubernetes
 rsa==4.9
@@ -151,8 +150,6 @@ six==1.16.0
     #   python-dateutil
 stack-data==0.6.2
     # via ipython
-theblues==0.5.2
-    # via juju
 tomli==2.0.1
     # via
     #   ipdb
@@ -176,7 +173,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