Merge branch 'main' into extra-sans

canonical · Dec 4, 2024 · cd7f9b5 · cd7f9b5
2 parents 5634d03 + b4a17c5
commit cd7f9b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml
@@ -68,11 +68,11 @@ bases:
       architectures: [arm64]
 config:
   options:
-    annotations:
+    cluster-annotations:
       type: string
       default: ""
       description: |
-        Annotations is a space separated list of (key/value) pairs)  that can be
+        Space-separated list of (key/value) pairs) that can be
         used to add arbitrary metadata configuration to the Canonical
         Kubernetes cluster. For more information, see the upstream Canonical
         Kubernetes documentation about annotations:

diff --git a/charms/worker/k8s/src/charm.py b/charms/worker/k8s/src/charm.py
@@ -398,7 +398,7 @@ def _configure_cos_integration(self):
             self.collector.request(relation)
 
     def _get_valid_annotations(self) -> Optional[dict]:
-        """Fetch and validate annotations from charm configuration.
+        """Fetch and validate cluster-annotations from charm configuration.
 
         The values are expected to be a space-separated string of key-value pairs.
 
@@ -408,7 +408,7 @@ def _get_valid_annotations(self) -> Optional[dict]:
         Raises:
             ReconcilerError: If any annotation is invalid.
         """
-        raw_annotations = self.config.get("annotations")
+        raw_annotations = self.config.get("cluster-annotations")
         if not raw_annotations:
             return None