Add support for spec overrides when restoring EDA

ansible · May 22, 2024 · 340d9d7 · 340d9d7
1 parent 6393d61
commit 340d9d7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/config/crd/bases/eda.ansible.com_edarestores.yaml b/config/crd/bases/eda.ansible.com_edarestores.yaml
@@ -93,6 +93,10 @@ spec:
               postgres_image_version:
                 description: PostgreSQL container image version to use
                 type: string
+              spec_overrides:
+                description: Overrides for the EDA spec
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
               no_log:
                 description: Configure no_log for no_log tasks
                 type: boolean

diff --git a/config/manifests/bases/eda-server-operator.clusterserviceversion.yaml b/config/manifests/bases/eda-server-operator.clusterserviceversion.yaml
@@ -148,6 +148,10 @@ spec:
         path: postgres_image_version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:hidden
+      - displayName: EDA Spec Overrides
+        path: spec_overrides
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:advanced
       - displayName: Restore Management Pod Resource Requirements
         path: restore_resource_requirements
         x-descriptors:

diff --git a/roles/restore/defaults/main.yml b/roles/restore/defaults/main.yml
@@ -28,4 +28,6 @@ restore_resource_requirements:
 
 # Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self)
 set_self_labels: true
+
+spec_overrides: {}
 ...
diff --git a/roles/restore/tasks/deploy_eda.yml b/roles/restore/tasks/deploy_eda.yml
@@ -1,4 +1,8 @@
 ---
+- name: Combine spec_overrides with spec
+  set_fact:
+    spec: "{{ spec | default({}) | combine(spec_overrides) }}"
+  no_log: "{{ no_log }}"
 
 - name: Deploy EDA
   k8s: