Merge branch 'main' into KU-583/local-storage-config

canonical · Nov 19, 2024 · 4059713 · 4059713
2 parents 590b242 + 32c2da0
commit 4059713
Show file tree

Hide file tree

Showing 11 changed files with 1,578 additions and 4 deletions.
diff --git a/charms/worker/charmcraft.yaml b/charms/worker/charmcraft.yaml
@@ -85,6 +85,14 @@ parts:
       rm -rf $CRAFT_PRIME/lib $CRAFT_PRIME/templates
       mv $CRAFT_PRIME/k8s/lib $CRAFT_PRIME/lib
       mv $CRAFT_PRIME/k8s/templates $CRAFT_PRIME/templates
+actions:
+  pre-upgrade-check:
+    description: Run necessary pre-upgrade checks before executing a charm upgrade.
+
+peers:
+  upgrade:
+    interface: upgrade
+
 
 provides:
   cos-agent:

diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml
@@ -192,6 +192,9 @@ actions:
       server:
         description: Override the server endpoint with this field
         type: string
+  pre-upgrade-check:
+    description: Run necessary pre-upgrade checks before executing a charm upgrade.
+
 
 parts:
   charm:
@@ -203,6 +206,8 @@ peers:
     interface: k8s-cluster
   cos-tokens:
     interface: cos-k8s-tokens
+  upgrade:
+    interface: upgrade
 
 provides:
   cos-agent: