Makes Multus lib return False on error 401 instead of raising an exce…

…ption
canonical · Dec 9, 2024 · 32425e6 · 32425e6
1 parent 3d91245
commit 32425e6
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/charms/kubernetes_charm_libraries/v0/multus.py b/lib/charms/kubernetes_charm_libraries/v0/multus.py
@@ -249,7 +249,7 @@ def network_attachment_definition_is_created(
                 )
             return False
         except httpx.HTTPStatusError as e:
-            if e.response.status_code in [401, 404]:
+            if e.response.status_code == 404:
                 raise KubernetesMultusError(
                     "NetworkAttachmentDefinition resource not found. "
                     "You may need to install Multus CNI."
@@ -573,8 +573,18 @@ def multus_is_available(self) -> bool:
                     res=NetworkAttachmentDefinition, namespace=self.namespace
                 )
             )
+        except ApiError as e:
+            if e.status.reason == "NotFound":
+                logger.debug("NetworkAttachmentDefinition resource not found")
+            elif e.status.reason == "Unauthorized":
+                logger.debug("kube-apiserver not ready yet")
+            else:
+                raise KubernetesMultusError(
+                    "Unexpected outcome when checking for Multus availability"
+                )
+            return False
         except httpx.HTTPStatusError as e:
-            if e.response.status_code in [401, 404]:
+            if e.response.status_code == 404:
                 return False
             else:
                 raise KubernetesMultusError(