vexxhost · mnaser · Nov 22, 2023 · Nov 22, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -29,17 +29,13 @@ jobs:
         scenario:
           - cluster-api
           - cluster-api-upgrade
-          - containerd
           - helm
           - upload-helm-chart
         distro:
           - rockylinux8
           - rockylinux9
           - ubuntu2004
           - ubuntu2204
-        include:
-          - scenario: forget-package
-            distro: ubuntu2004
     steps:
       - name: Checkout project
         uses: actions/checkout@v3

diff --git a/docs/ops/upgrades.md b/docs/ops/upgrades.md
@@ -47,7 +47,7 @@ cluster is still functional after each step.
       hosts: "{{ kubernetes_group | default('all') }}"
       become: true
       roles:
-        - role: vexxhost.kubernetes.containerd
+        - role: vexxhost.containers.containerd
     END
     ```
 
@@ -76,7 +76,7 @@ cluster is still functional after each step.
       become: true
       roles:
         - role: vexxhost.atmosphere.defaults
-        - role: vexxhost.kubernetes.containerd
+        - role: vexxhost.containers.containerd
           vars:
             containerd_pause_image: "{{ atmosphere_images['pause'] }}"
     END

diff --git a/galaxy.yml b/galaxy.yml
@@ -12,6 +12,7 @@ dependencies:
   community.crypto: ">=2.2.3"
   community.general: ">=4.5.0"
   kubernetes.core: ">=2.3.2"
+  vexxhost.containers: ">=1.0.1"
 tags:
   - application
   - cloud

diff --git a/molecule/cluster-api/verify.yml b/molecule/cluster-api/verify.yml
@@ -20,7 +20,6 @@
       ansible.builtin.include_vars:
         file: "../../roles/{{ item }}/defaults/main.yml"
       loop:
-        - download_artifact
         - clusterctl
         - cluster_api
 

diff --git a/molecule/containerd/converge.yml b/molecule/containerd/converge.yml
diff --git a/molecule/containerd/molecule.yml b/molecule/containerd/molecule.yml
diff --git a/molecule/containerd/prepare.yml b/molecule/containerd/prepare.yml
diff --git a/molecule/containerd/verify.yml b/molecule/containerd/verify.yml
diff --git a/molecule/forget-package/converge.yml b/molecule/forget-package/converge.yml
diff --git a/molecule/forget-package/molecule.yml b/molecule/forget-package/molecule.yml
diff --git a/molecule/forget-package/prepare.yml b/molecule/forget-package/prepare.yml
diff --git a/molecule/forget-package/verify.yml b/molecule/forget-package/verify.yml
diff --git a/playbooks/site.yml b/playbooks/site.yml
@@ -28,7 +28,7 @@
   hosts: "{{ kubernetes_group | default('all') }}"
   become: true
   roles:
-    - role: containerd
+    - role: vexxhost.containers.containerd
       tags:
         - containerd
 

diff --git a/roles/clusterctl/meta/main.yml b/roles/clusterctl/meta/main.yml
@@ -29,7 +29,7 @@ galaxy_info:
         - jammy
 
 dependencies:
-  - role: vexxhost.kubernetes.download_artifact
+  - role: vexxhost.containers.download_artifact
     download_artifact_url: "{{ clusterctl_download_url }}"
     download_artifact_dest: "{{ clusterctl_download_dest }}"
     download_artifact_checksum: "sha256:{{ clusterctl_binary_checksum }}"

diff --git a/roles/cni_plugins/README.md b/roles/cni_plugins/README.md