Merge branch 'main' into DPE-4224-remove-relation-emits

canonical · Apr 30, 2024 · 5bceb15 · 5bceb15
2 parents fabc7ce + 704e521
commit 5bceb15
Show file tree

Hide file tree

Showing 42 changed files with 3,036 additions and 715 deletions.
diff --git a/actions.yaml b/actions.yaml
@@ -62,4 +62,17 @@ restore:
       description: |
         A backup-id to identify the backup to restore. Format: backup-id=<string>.
   required:
-    - backup-id
+    - backup-id
+
+resume-upgrade:
+  description: Upgrade remaining units (after you manually verified that upgraded units are healthy).
+
+force-upgrade:
+  description: |
+    Potential of *data loss* and *downtime*
+        
+    Force upgrade of this unit.
+    
+    Use to
+    - force incompatible upgrade and/or
+    - continue upgrade if 1+ upgraded units have non-active status
diff --git a/charm_version b/charm_version
@@ -0,0 +1 @@
+1
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -20,6 +20,9 @@ parts:
       fi
     charm-strict-dependencies: true
     charm-entrypoint: src/charm.py
+    prime:
+      - charm_version
+      - workload_version
     build-packages:
       - cargo
       - libffi-dev