feat: add mysql init job patch and fix command on mongo init job (edu…

…NEXT#63)
Ian2012 · Jan 17, 2024 · d838e22 · d838e22
1 parent 4ef0da5
commit d838e22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/drydock/templates/drydock/k8s/drydock-jobs/mongodb.yml b/drydock/templates/drydock/k8s/drydock-jobs/mongodb.yml
@@ -23,12 +23,13 @@ spec:
         args:
         - |
           echo "Initialising MongoDB..."
-          mongo --host {{MONGODB_HOST }} -u "{{ MONGODB_ROOT_USERNAME }}" -p "{{ MONGODB_ROOT_PASSWORD }}" admin <<EOF
+          mongo --host {{MONGODB_HOST }} {% if MONGODB_ROOT_USERNAME and MONGODB_ROOT_PASSWORD %} -u {{ MONGODB_ROOT_USERNAME }} -p {{ MONGODB_ROOT_PASSWORD }} {% endif %} admin <<EOF
+          {%- endif %}
             {%- if MONGODB_USERNAME %}
             if (db.getUser("{{ MONGODB_USERNAME }}") == null) {
               db.createUser({
                   user: "{{ MONGODB_USERNAME }}",
-                  pwd:  "{{ MONGODB_PASSWORD }}",   
+                  pwd:  "{{ MONGODB_PASSWORD }}",
                   roles: [
                     { role: "readWrite", db: "{{ MONGODB_DATABASE }}" },
                     {% if FORUM_DOCKER_IMAGE is defined %}{ role: "readWrite", db: "{{ FORUM_MONGODB_DATABASE }}" },{% endif %}
@@ -44,6 +45,6 @@ spec:
               })
             }
             {%- endif %}
-            {{ patch("drydock-mongodb-init-job") }}
+            {{ patch("drydock-mongodb-init-job")|indent(12) }}
             exit
           EOF
diff --git a/drydock/templates/drydock/k8s/drydock-jobs/mysql.yml b/drydock/templates/drydock/k8s/drydock-jobs/mysql.yml
@@ -42,3 +42,4 @@ spec:
           mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE USER IF NOT EXISTS '{{ OPENEDX_MYSQL_USERNAME }}';"
           mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "ALTER USER '{{ OPENEDX_MYSQL_USERNAME }}'@'%' IDENTIFIED BY '{{ OPENEDX_MYSQL_PASSWORD }}';"
           mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "GRANT ALL ON {{ OPENEDX_MYSQL_DATABASE }}.* TO '{{ OPENEDX_MYSQL_USERNAME }}'@'%';"
+          {{ patch("drydock-mysql-init-job")|indent(10) }}