update auth/tls template config for containerd 1.3.x (#34)

charmed-kubernetes · Jun 1, 2020 · 29ebcf9 · 29ebcf9
1 parent 848bcff
commit 29ebcf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/reactive/containerd.py b/reactive/containerd.py
@@ -185,12 +185,14 @@ def upgrade_charm():
     """
     Triggered when upgrade-charm is called.
 
-    Prevent containerd being implicitly updated.
-
     :return: None
     """
+    # Prevent containerd apt pkg from being implicitly updated.
     apt_hold(CONTAINERD_PACKAGE)
 
+    # Re-render config in case the template has changed in the new charm.
+    config_changed()
+
 
 @when_not('containerd.br_netfilter.enabled')
 def enable_br_netfilter_module():

diff --git a/templates/config.toml b/templates/config.toml
@@ -69,7 +69,7 @@ oom_score = 0
           password = "{{ registry.password }}"
         {% endif %}
       {% endfor %}
-      [plugins.cri.registry.tls_configs]
+      [plugins.cri.registry.configs]
       {% for registry in custom_registries %}
         {% if registry.ca or registry.cert or registry.key or registry.insecure_skip_verify %}
         [plugins.cri.registry.configs."{{ registry.url }}".tls]