fix: move ceph_csi_rbd to offline-install
diff --git a/roles/ceph_csi_rbd/defaults/main.yml b/roles/ceph_csi_rbd/defaults/main.yml
index 3dd8f08..dc29137 100644
--- a/roles/ceph_csi_rbd/defaults/main.yml
+++ b/roles/ceph_csi_rbd/defaults/main.yml
@@ -1,43 +1,26 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-# :local:
-
-
-# .. envvar:: ceph_csi_rbd_ceph_fsid [[[
+# Copyright (c) 2023 VEXXHOST, Inc.
#
-# Filesystem ID for Ceph cluster
+# 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.
+
ceph_csi_rbd_ceph_fsid: "{{ ceph_mon_fsid }}"
-
- # ]]]
-# .. envvar:: ceph_csi_rbd_mons_group [[[
-#
-# Ansible group that contains all Ceph monitors
ceph_csi_rbd_mons_group: controllers
-
- # ]]]
-# .. envvar:: ceph_csi_rbd_id [[[
-#
-# ID of the Ceph CSI RBD user
ceph_csi_rbd_id: kube
-
- # ]]]
-# .. envvar:: ceph_csi_rbd_user [[[
-#
-# Name of Ceph user to use for Ceph CSI RBD
ceph_csi_rbd_user: "client.{{ ceph_csi_rbd_id }}"
-
- # ]]]
-# .. envvar:: ceph_csi_rbd_pool [[[
-#
-# Name of Ceph pool to use for Ceph CSI RBD
ceph_csi_rbd_pool: kube
- # ]]]
+ceph_csi_rbd_helm_release_name: ceph-csi-rbd
+ceph_csi_rbd_helm_chart_path: "{{ role_path }}/../../charts/ceph-csi-rbd/"
+ceph_csi_rbd_helm_chart_ref: /usr/local/src/ceph-csi-rbd
+
+ceph_csi_rbd_helm_release_namespace: kube-system
+ceph_csi_rbd_helm_values: {}
diff --git a/roles/ceph_csi_rbd/meta/main.yml b/roles/ceph_csi_rbd/meta/main.yml
index e113fd6..b9745a6 100644
--- a/roles/ceph_csi_rbd/meta/main.yml
+++ b/roles/ceph_csi_rbd/meta/main.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 VEXXHOST, Inc.
+# 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
@@ -25,4 +25,7 @@
dependencies:
- role: defaults
- - role: atmosphere
+ - role: upload_helm_chart
+ vars:
+ upload_helm_chart_src: "{{ ceph_csi_rbd_helm_chart_path }}"
+ upload_helm_chart_dest: "{{ ceph_csi_rbd_helm_chart_ref }}"
diff --git a/roles/ceph_csi_rbd/tasks/main.yml b/roles/ceph_csi_rbd/tasks/main.yml
index 4df8040..04826e5 100644
--- a/roles/ceph_csi_rbd/tasks/main.yml
+++ b/roles/ceph_csi_rbd/tasks/main.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 VEXXHOST, Inc.
+# 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
@@ -26,6 +26,7 @@
- name: Create Ceph pool
delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
+ run_once: true
vexxhost.atmosphere.ceph_pool:
name: "{{ ceph_csi_rbd_pool }}"
rule_name: "{{ ceph_csi_rbd_rule_name | default(omit) }}"
@@ -34,6 +35,7 @@
- name: Create user {{ ceph_csi_rbd_user }}
delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
+ run_once: true
vexxhost.atmosphere.ceph_key:
name: "{{ ceph_csi_rbd_user }}"
caps:
@@ -43,6 +45,7 @@
- name: Retrieve keyring for {{ ceph_csi_rbd_user }}
delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
+ run_once: true
vexxhost.atmosphere.ceph_key:
name: "{{ ceph_csi_rbd_user }}"
state: info
@@ -50,65 +53,41 @@
register: _ceph_key
- name: Store keyring inside fact
+ run_once: true
ansible.builtin.set_fact:
_ceph_rbd_csi_ceph_keyring: "{{ _ceph_key.stdout | from_json | first }}"
-- name: Deploy Helm chart
- kubernetes.core.k8s:
- state: present
- definition:
- - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+# NOTE(mnaser): We should get rid of this task eventually as it is suspending
+# the old HelmRelease and removing it to avoid uninstalling the
+# Helm chart.
+- name: Uninstall the legacy HelmRelease
+ run_once: true
+ block:
+ - name: Suspend the existing HelmRelease
+ kubernetes.core.k8s:
+ state: patched
+ api_version: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
- metadata:
- name: ceph-csi-rbd
- namespace: kube-system
- spec:
- interval: 60s
- chart:
- spec:
- chart: ceph-csi-rbd
- version: 3.5.1
- sourceRef:
- kind: HelmRepository
- name: ceph
- values:
- csiConfig:
- - clusterID: "{{ ceph_csi_rbd_ceph_fsid }}"
- monitors: "{{ ceph_monitors }}"
- nodeplugin:
- httpMetrics:
- containerPort: 8081
- registrar:
- image:
- repository: "{{ atmosphere_images['csi_node_driver_registrar'] | docker_image('name') }}"
- plugin:
- image:
- repository: "{{ atmosphere_images['csi_rbd_plugin'] | docker_image('name') }}"
- provisioner:
- nodeSelector:
- openstack-control-plane: enabled
- provisioner:
- image:
- repository: "{{ atmosphere_images['csi_rbd_provisioner'] | docker_image('name') }}"
- attacher:
- image:
- repository: "{{ atmosphere_images['csi_rbd_attacher'] | docker_image('name') }}"
- resizer:
- image:
- repository: "{{ atmosphere_images['csi_rbd_resizer'] | docker_image('name') }}"
- snapshotter:
- image:
- repository: "{{ atmosphere_images['csi_rbd_snapshotter'] | docker_image('name') }}"
- storageClass:
- create: true
- name: general
- annotations:
- storageclass.kubernetes.io/is-default-class: "true"
- clusterID: "{{ ceph_csi_rbd_ceph_fsid }}"
- pool: "{{ ceph_csi_rbd_pool }}"
- mountOptions:
- - discard
- secret:
- create: true
- userID: "{{ ceph_csi_rbd_id }}"
- userKey: "{{ _ceph_rbd_csi_ceph_keyring.key }}"
+ name: "{{ ceph_csi_rbd_helm_release_name }}"
+ namespace: "{{ ceph_csi_rbd_helm_release_namespace }}"
+ definition:
+ spec:
+ suspend: true
+
+ - name: Remove the existing HelmRelease
+ kubernetes.core.k8s:
+ state: absent
+ api_version: helm.toolkit.fluxcd.io/v2beta1
+ kind: HelmRelease
+ name: "{{ ceph_csi_rbd_helm_release_name }}"
+ namespace: "{{ ceph_csi_rbd_helm_release_namespace }}"
+
+- name: Deploy Helm chart
+ run_once: true
+ kubernetes.core.helm:
+ name: "{{ ceph_csi_rbd_helm_release_name }}"
+ chart_ref: "{{ ceph_csi_rbd_helm_chart_ref }}"
+ release_namespace: "{{ ceph_csi_rbd_helm_release_namespace }}"
+ create_namespace: true
+ kubeconfig: /etc/kubernetes/admin.conf
+ values: "{{ _ceph_csi_rbd_helm_values | combine(ceph_csi_rbd_helm_values, recursive=True) }}"
diff --git a/roles/ceph_csi_rbd/vars/main.yml b/roles/ceph_csi_rbd/vars/main.yml
new file mode 100644
index 0000000..1d728a5
--- /dev/null
+++ b/roles/ceph_csi_rbd/vars/main.yml
@@ -0,0 +1,55 @@
+# 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.
+
+_ceph_csi_rbd_helm_values:
+ csiConfig:
+ - clusterID: "{{ ceph_csi_rbd_ceph_fsid }}"
+ monitors: "{{ ceph_monitors }}"
+ nodeplugin:
+ httpMetrics:
+ containerPort: 8081
+ registrar:
+ image:
+ repository: "{{ atmosphere_images['csi_node_driver_registrar'] | docker_image('name') }}"
+ plugin:
+ image:
+ repository: "{{ atmosphere_images['csi_rbd_plugin'] | docker_image('name') }}"
+ provisioner:
+ nodeSelector:
+ openstack-control-plane: enabled
+ provisioner:
+ image:
+ repository: "{{ atmosphere_images['csi_rbd_provisioner'] | docker_image('name') }}"
+ attacher:
+ image:
+ repository: "{{ atmosphere_images['csi_rbd_attacher'] | docker_image('name') }}"
+ resizer:
+ image:
+ repository: "{{ atmosphere_images['csi_rbd_resizer'] | docker_image('name') }}"
+ snapshotter:
+ image:
+ repository: "{{ atmosphere_images['csi_rbd_snapshotter'] | docker_image('name') }}"
+ storageClass:
+ create: true
+ name: general
+ annotations:
+ storageclass.kubernetes.io/is-default-class: "true"
+ clusterID: "{{ ceph_csi_rbd_ceph_fsid }}"
+ pool: "{{ ceph_csi_rbd_pool }}"
+ mountOptions:
+ - discard
+ secret:
+ create: true
+ userID: "{{ ceph_csi_rbd_id }}"
+ userKey: "{{ _ceph_rbd_csi_ceph_keyring.key }}"