configure containerd reigstries before waiting for microk8s on install (

#116)
canonical · Sep 14, 2023 · 3fe1b8c · 3fe1b8c
1 parent e639ad1
commit 3fe1b8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -178,8 +178,13 @@ def on_install(self, _: InstallEvent):
 
         self.unit.status = MaintenanceStatus("installing MicroK8s")
         microk8s.install()
+
+        self.unit.status = MaintenanceStatus("initial containerd configuration")
+        self.config_containerd_proxy(None)
+        self.config_containerd_registries(None)
         try:
-            microk8s.wait_ready()
+            if not isinstance(self.unit.status, BlockedStatus):
+                microk8s.wait_ready()
         except subprocess.CalledProcessError:
             LOG.exception("timed out waiting for node to come up")
 

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -26,7 +26,7 @@ def test_install(role, e: Environment):
 
     e.util.install_required_packages.assert_called_once_with()
     e.microk8s.install.assert_called_once_with()
-    e.microk8s.set_containerd_proxy_options.assert_called_once_with(
+    e.microk8s.set_containerd_proxy_options.assert_called_with(
         "fakehttpproxy", "fakehttpsproxy", "fakenoproxy"
     )