feat: Use vexxhost.containers

.github/workflows/molecule.yml

@@ -29,7 +29,6 @@ jobs:
         scenario:
           - cluster-api
           - cluster-api-upgrade
-          - containerd
           - helm
           - upload-helm-chart
         distro:

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

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.0"
 tags:
   - application
   - cloud

playbooks/kubernetes.yml

@@ -0,0 +1,49 @@
+# Copyright (c) 2023 VEXXHOST, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+- name: Configure Kubernetes VIP
+  hosts: "{{ kubernetes_control_plane_group | default('controllers') }}"
+  become: true
+  roles:
+    - role: keepalived
+      tags:
+        - keepalived
+
+    - role: haproxy
+      tags:
+        - haproxy
+
+- name: Install Kubernetes
+  hosts: "{{ kubernetes_group | default('all') }}"
+  become: true
+  roles:
+    - role: kubernetes
+      tags:
+        - kubernetes
+
+- name: Install control-plane components
+  hosts: "{{ kubernetes_control_plane_group | default('controllers') }}"
+  become: true
+  roles:
+    - role: helm
+      tags:
+        - helm
+
+    - role: cilium
+      tags:
+        - cilium
+
+    # - role: csi
+    #   tags:
+    #     - csi

playbooks/site.yml

@@ -12,42 +12,5 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Configure Kubernetes VIP
-  hosts: "{{ kubernetes_control_plane_group | default('controllers') }}"
-  become: true
-  roles:
-    - role: keepalived
-      tags:
-        - keepalived
-
-    - role: haproxy
-      tags:
-        - haproxy
-
-- name: Install Kubernetes
-  hosts: "{{ kubernetes_group | default('all') }}"
-  become: true
-  roles:
-    - role: containerd
-      tags:
-        - containerd
-
-    - role: kubernetes
-      tags:
-        - kubernetes
-
-- name: Install control-plane components
-  hosts: "{{ kubernetes_control_plane_group | default('controllers') }}"
-  become: true
-  roles:
-    - role: helm
-      tags:
-        - helm
-
-    - role: cilium
-      tags:
-        - cilium
-
-    # - role: csi
-    #   tags:
-    #     - csi
+- import_playbook: vexxhost.containers.site
+- import_playbook: vexxhost.kubernetes.kubernetes