fix compatibility with new SDI (#126)

* make compatible to new SDI * unpin controller version * pin juju * update versions for publish * juju version * error status * added chisme --------- Co-authored-by: Andrew Scribner <[email protected]>
canonical · Jun 13, 2023 · c30071b · c30071b
1 parent 97a6ddc
commit c30071b
Show file tree

Hide file tree

Showing 12 changed files with 257 additions and 222 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -43,12 +43,11 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup operator environment
-        uses: claudiubelu/actions-operator@18ebf92ae3043bd3dd15238e5d9b662d7ba08daf
+        uses: charmed-kubernetes/actions-operator@main
         with:
           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"
+          juju-channel: 2.9/stable
           microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
 
       # https://github.com/charmed-kubernetes/actions-operator/issues/27

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -58,7 +58,7 @@ jobs:
           ref: ${{ inputs.source_branch }}
 
       - name: Select charmhub channel
-        uses: canonical/charming-actions/channel@2.2.2
+        uses: canonical/charming-actions/channel@2.3.0
         id: select-channel
         if: ${{ inputs.destination_channel == '' }}
 
@@ -84,7 +84,7 @@ jobs:
           echo "::set-output name=tag_prefix::$tag_prefix"
 
       - name: Upload charm to charmhub
-        uses: canonical/charming-actions/upload-charm@2.2.2
+        uses: canonical/charming-actions/upload-charm@2.3.0
         with:
           credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/requirements-fmt.txt b/requirements-fmt.txt
@@ -4,19 +4,21 @@
 #
 #    pip-compile --resolver=backtracking ./requirements-fmt.in
 #
-black==22.12.0
+black==23.3.0
     # via -r ./requirements-fmt.in
 click==8.1.3
     # via black
-isort==5.10.1
+isort==5.12.0
     # via -r ./requirements-fmt.in
-mypy-extensions==0.4.3
+mypy-extensions==1.0.0
     # via black
-pathspec==0.10.3
+packaging==23.1
     # via black
-platformdirs==2.6.0
+pathspec==0.11.1
+    # via black
+platformdirs==3.5.3
     # via black
 tomli==2.0.1
     # via black
-typing-extensions==4.4.0
+typing-extensions==4.6.3
     # via black
diff --git a/requirements-integration.in b/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
 selenium