Merge pull request #803 from rooftopcellist/sts-db-check

Run database-check initContainer on postgres sts instead

roles/installer/defaults/main.yml

@@ -222,6 +222,7 @@ postgres_tolerations: ''
 postgres_storage_requirements:
   requests:
     storage: 8Gi
+postgres_init_container_resource_requirements: {}
 postgres_resource_requirements: {}
 postgres_data_path: '/var/lib/postgresql/data/pgdata'
 

roles/installer/tasks/main.yml

@@ -36,6 +36,9 @@
 - name: Include broadcast websocket configuration tasks
   include_tasks: broadcast_websocket_configuration.yml
 
+- name: Include set_images tasks
+  include_tasks: set_images.yml
+
 - name: Include database configuration tasks
   include_tasks: database_configuration.yml
 

roles/installer/tasks/resources_configuration.yml

@@ -47,24 +47,6 @@
   set_fact:
     _image: "{{ _custom_image | default(lookup('env', 'RELATED_IMAGE_AWX')) | default(_default_image, true) }}"
 
-- name: Set default awx init container image
-  set_fact:
-    _default_init_container_image: "{{ _init_container_image }}:{{ _init_container_image_version }}"
-
-- name: Set user provided awx init image
-  set_fact:
-    _custom_init_container_image: "{{ init_container_image }}:{{ init_container_image_version }}"
-  when:
-    - init_container_image | default([]) | length
-    - init_container_image_version is defined or init_container_image_version != ''
-
-- name: Set Init image URL
-  set_fact:
-    _init_container_image: >-
-      {{ _custom_init_container_image |
-         default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) |
-         default(_default_init_container_image, true) }}
-
 - name: Set default redis image
   set_fact:
     _default_redis_image: "{{ _redis_image }}:{{ _redis_image_version }}"

roles/installer/tasks/set_images.yml

@@ -0,0 +1,19 @@
+# For disconnected environments, images must be set based on the values of `RELATED_IMAGE_` variables
+---
+- name: Set default awx init container image
+  set_fact:
+    _default_init_container_image: "{{ _init_container_image }}:{{ _init_container_image_version }}"
+
+- name: Set user provided awx init image
+  set_fact:
+    _custom_init_container_image: "{{ init_container_image }}:{{ init_container_image_version }}"
+  when:
+    - init_container_image | default([]) | length
+    - init_container_image_version is defined or init_container_image_version != ''
+
+- name: Set Init image URL
+  set_fact:
+    _init_container_image: >-
+      {{ _custom_init_container_image |
+         default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) |
+         default(_default_init_container_image, true) }}

roles/installer/templates/deployment.yaml.j2

@@ -38,20 +38,6 @@ spec:
         - name: {{ image_pull_secret }}
 {% endif %}
       initContainers:
-{% if managed_database %}
-        - name: database-check
-          image: '{{ _init_container_image }}'
-          imagePullPolicy: '{{ image_pull_policy }}'
-          command:
-            - /bin/sh
-            - -c
-            - |
-              [[ -d /check-db/pgsql/data ]] && rm -rf /check-db/data && mv /check-db/pgsql/data/ /check-db/data/ && rm -rf /check-db/pgsql || true
-          volumeMounts:
-            - name: check-db-pvc
-              mountPath: /check-db
-              subPath: ''
-{% endif %}
 {% if bundle_ca_crt or projects_persistence|bool or init_container_extra_commands %}
         - name: init
           image: '{{ _init_container_image }}'
@@ -344,11 +330,6 @@ spec:
 {% endif %}
 {% endif %}
       volumes:
-{% if managed_database %}
-        - name: check-db-pvc
-          persistentVolumeClaim:
-            claimName: postgres-{{ ansible_operator_meta.name }}-postgres-0
-{% endif %}
 {% if bundle_ca_crt %}
         - name: "ca-trust-extracted"
           emptyDir: {}

roles/installer/templates/postgres.yaml.j2

@@ -37,6 +37,20 @@ spec:
       imagePullSecrets:
         - name: {{ image_pull_secret }}
 {% endif %}
+      initContainers:
+        - name: database-check
+          image: '{{ _init_container_image }}'
+          resources: {{ postgres_init_container_resource_requirements }}
+          imagePullPolicy: '{{ image_pull_policy }}'
+          command:
+            - /bin/sh
+            - -c
+            - |
+              [[ -d /check-db/pgsql/data ]] && rm -rf /check-db/data && mv /check-db/pgsql/data/ /check-db/data/ && rm -rf /check-db/pgsql || exit 0
+          volumeMounts:
+            - name: postgres
+              mountPath: /check-db
+              subPath: ''
       containers:
         - image: '{{ _postgres_image }}'
           imagePullPolicy: '{{ image_pull_policy }}'