Adjust the failure mode when there's no keystone-auth-service

charmed-kubernetes · Jun 7, 2024 · dc2dd1a · dc2dd1a
1 parent f7c9db2
commit dc2dd1a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/auth_webhook.py b/src/auth_webhook.py
@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 import random
@@ -40,9 +41,9 @@ def _uplift_keystone_endpoint() -> str:
     """Uplift the keystone auth service from a cdk-addons installation."""
     try:
         keystone_auth_service = kubectl_get(
-            "service", "-n", "kube-system", "k8s-keystone-auth-service"
+            "service", "-n", "kube-system", "k8s-keystone-auth-service", "--ignore-not-found=true"
         )
-    except CalledProcessError:
+    except json.JSONDecodeError:
         log.info("No k8s-keystone-auth-service to uplift")
         return None
     labels = keystone_auth_service.get("metadata", {}).get("labels", {})