Revert wait-for-migrations configmap

Use aap-eda-manage wait_for_migrations management command
ansible · Jun 4, 2024 · 70aa286 · 70aa286
1 parent d4620c8
commit 70aa286
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 110 deletions.
diff --git a/roles/eda/tasks/deploy_eda.yml b/roles/eda/tasks/deploy_eda.yml
@@ -19,12 +19,6 @@
     definition: "{{ lookup('template', 'eda.configmap.yaml.j2') }}"
     wait: yes
 
-- name: Apply wait-for-migrations ConfigMap resources
-  k8s:
-    apply: yes
-    definition: "{{ lookup('template', 'eda.wait-for-migrations.configmap.yaml.j2') }}"
-    wait: yes
-
 - name: Apply deployment resources
   k8s:
     apply: yes

diff --git a/roles/eda/templates/eda-activation-worker.deployment.yaml.j2 b/roles/eda/templates/eda-activation-worker.deployment.yaml.j2
@@ -64,15 +64,14 @@ spec:
       topologySpreadConstraints:
         {{ combined_activation_worker.topology_spread_constraints | indent(width=8) }}
 {% endif %}
-{% if bundle_ca_crt  %}
       initContainers:
       - name: wait-for-migrations
         image: {{ _image }}
         imagePullPolicy: '{{ image_pull_policy }}'
         command:
           - /bin/bash
           - -c
-          - /var/lib/eda/wait-for-migrations
+          - aap-eda-manage wait_for_migrations -t 60
         envFrom:
           - configMapRef:
               name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-env-properties'
@@ -110,10 +109,7 @@ spec:
 {% if combined_activation_worker.resource_requirements is defined %}
         resources: {{ combined_activation_worker.resource_requirements }}
 {% endif %}
-        volumeMounts:
-          - name: wait-for-migrations
-            mountPath: /usr/bin/wait-for-migrations
-            subPath: wait-for-migrations
+{% if bundle_ca_crt  %}
       - name: configure-bundle-ca-cert
         image: {{ _image }}
         imagePullPolicy: '{{ image_pull_policy }}'
@@ -204,9 +200,3 @@ spec:
               - key: bundle-ca.crt
                 path: 'bundle-ca.crt'
 {% endif %}
-        - name: wait-for-migrations
-          configMap:
-            name: "{{ ansible_operator_meta.name }}-wait-for-migrations"
-            items:
-              - key: wait-for-migrations
-                path: wait-for-migrations
diff --git a/roles/eda/templates/eda-default-worker.deployment.yaml.j2 b/roles/eda/templates/eda-default-worker.deployment.yaml.j2
@@ -64,15 +64,14 @@ spec:
       topologySpreadConstraints:
         {{ combined_default_worker.topology_spread_constraints | indent(width=8) }}
 {% endif %}
-{% if bundle_ca_crt  %}
       initContainers:
       - name: wait-for-migrations
         image: {{ _image }}
         imagePullPolicy: '{{ image_pull_policy }}'
         command:
           - /bin/bash
           - -c
-          - /var/lib/eda/wait-for-migrations
+          - aap-eda-manage wait_for_migrations -t 60
         envFrom:
           - configMapRef:
               name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-env-properties'
@@ -110,10 +109,7 @@ spec:
 {% if combined_default_worker.resource_requirements is defined %}
         resources: {{ combined_default_worker.resource_requirements }}
 {% endif %}
-        volumeMounts:
-          - name: wait-for-migrations
-            mountPath: /usr/bin/wait-for-migrations
-            subPath: wait-for-migrations
+{% if bundle_ca_crt  %}
       - name: configure-bundle-ca-cert
         image: {{ _image }}
         imagePullPolicy: '{{ image_pull_policy }}'
@@ -204,9 +200,3 @@ spec:
               - key: bundle-ca.crt
                 path: 'bundle-ca.crt'
 {% endif %}
-        - name: wait-for-migrations
-          configMap:
-            name: "{{ ansible_operator_meta.name }}-wait-for-migrations"
-            items:
-              - key: wait-for-migrations
-                path: wait-for-migrations
diff --git a/roles/eda/templates/eda-scheduler.deployment.yaml.j2 b/roles/eda/templates/eda-scheduler.deployment.yaml.j2
@@ -70,7 +70,7 @@ spec:
         command:
           - /bin/bash
           - -c
-          - /var/lib/eda/wait-for-migrations
+          - aap-eda-manage wait_for_migrations -t 60
         envFrom:
           - configMapRef:
               name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-env-properties'
@@ -108,10 +108,6 @@ spec:
 {% if combined_scheduler.resource_requirements is defined %}
         resources: {{ combined_scheduler.resource_requirements }}
 {% endif %}
-        volumeMounts:
-          - name: wait-for-migrations
-            mountPath: /usr/bin/wait-for-migrations
-            subPath: wait-for-migrations
       containers:
       - name: eda-scheduler
         image: {{ _image }}
@@ -157,13 +153,5 @@ spec:
 {% if combined_scheduler.resource_requirements is defined %}
         resources: {{ combined_scheduler.resource_requirements }}
 {% endif %}
-      volumes:
-        - name: wait-for-migrations
-          configMap:
-            name: "{{ ansible_operator_meta.name }}-wait-for-migrations"
-            items:
-              - key: wait-for-migrations
-                path: wait-for-migrations
-
       restartPolicy: Always
 status: {}
diff --git a/roles/eda/templates/eda.wait-for-migrations.configmap.yaml.j2 b/roles/eda/templates/eda.wait-for-migrations.configmap.yaml.j2