Merge branch 'main' into KF-5257-sidecar-rewrite

# Conflicts: # requirements-integration.txt # requirements-unit.txt # requirements.txt
canonical · Mar 20, 2024 · 91950a9 · 91950a9
2 parents 6730db5 + 338f000
commit 91950a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 304 deletions.
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.1.1
+        uses: canonical/charming-actions/channel@2.4.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.1.1
+        uses: canonical/charming-actions/upload-charm@2.4.0
         with:
           credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Release charm to channel
-        uses: canonical/charming-actions/release-charm@2.1.1
+        uses: canonical/charming-actions/release-charm@2.4.0
         with:
           credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/lib/charms/observability_libs/v0/juju_topology.py b/lib/charms/observability_libs/v0/juju_topology.py
diff --git a/requirements.in b/requirements.in
@@ -5,6 +5,8 @@ charmed-kubeflow-chisme >= 0.3.0
 # from observability_libs.v0.juju_topology.py
 cosl
 envoy_data_plane==0.2.5
+# from observability_libs.v0.juju_topology.py
+cosl
 # if unpinned causes problems with installation resulting in module 'platform' has no attribute 'dist'
 oci-image
 ops