Merge branch 'main' into KU-729/ceph-integration

canonical · Oct 2, 2024 · 9400d0f · 9400d0f
2 parents 59470ea + f40b36b
commit 9400d0f
Show file tree

Hide file tree

Showing 23 changed files with 996 additions and 244 deletions.
diff --git a/charms/worker/charmcraft.yaml b/charms/worker/charmcraft.yaml
@@ -56,6 +56,7 @@ config:
         https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#noderestriction
 parts:
   charm:
+    plugin: charm
     build-packages: [git]
     charm-entrypoint: k8s/src/charm.py
   promote:

diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml
@@ -145,6 +145,7 @@ actions:
 
 parts:
   charm:
+    plugin: charm
     build-packages: [git]
 
 peers:
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,7 @@ actions: @@
     parts:
       charm:
+        plugin: charm
         build-packages: [git]
     peers:
@@ Expand Down @@