Merge pull request #455 from Normo/registry-database-migrations

Make sure to run registry metadata database migrations

Author: tobiashuste

molecule/gitlab/molecule.yml

@@ -40,6 +40,19 @@ provisioner:
               - key: "env"
                 type: "plain"
                 value: "{ 'OWN_PRIVATE_API_URL' => 'grpc://127.0.0.1:8155' }"
+          - registry:
+              - key: "database"
+                type: "plain"
+                value: |-
+                  {
+                    'enabled' => false,
+                    'host' => '{{ gitlab_postgresql_db_host }}',
+                    'port' => {{ gitlab_postgresql_db_port }},
+                    'user' => 'gitlab',
+                    'password' => '{{ gitlab_postgresql_db_password }}',
+                    'dbname' => 'registry',
+                    'sslmode' => 'disable'
+                  }
         gitlab_feature_flags:
           # See https://docs.gitlab.com/ee/user/feature_flags.html
           - name: "vscode_web_ide"

roles/gitlab/handlers/main.yml

@@ -20,6 +20,14 @@
   listen: "GitLab has been installed or upgraded"
   when: "gitlab_is_primary"
 
+- name: "Run registry metadata database migrations"
+  become: true
+  ansible.builtin.command: "gitlab-ctl registry-database migrate up --skip-post-deployment"
+  changed_when: true
+  when:
+    - "__gitlab_registry_database_used"
+    - "gitlab_is_primary"
+
 - name: "Reconfigure Non Primary GitLab"
   become: true
   ansible.builtin.shell:

roles/gitlab/tasks/check.yml

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
+#
+# SPDX-License-Identifier: Apache-2.0
+
+---
+
+- name: "Check whether gitlab-rails binary is installed"
+  ansible.builtin.stat:
+    path: "/usr/bin/gitlab-rails"
+  register: "gitlab_rails_binary"
+
+- name: "Determine if this is an initial dry-run"
+  ansible.builtin.set_fact:
+    gitlab_is_initial_dryrun: "{{ ansible_check_mode and not gitlab_rails_binary.stat.exists }}"
+
+- name: "Check if a previous reconfigure had failed"
+  ansible.builtin.stat:
+    path: "/etc/gitlab/reconfigure_failed"
+  register: "gitlab_reconfigure_failed"
+
+- name: "Check if registry configuration exists"
+  ansible.builtin.set_fact:
+    __gitlab_registry_config: "{{ item.registry }}"
+  when: "item.registry is defined"
+  loop: "{{ gitlab_additional_configurations }}"
+
+- name: "Check if database key is defined in registry"
+  ansible.builtin.set_fact:
+    __gitlab_registry_database_used: "{{ __gitlab_registry_config | default([]) | selectattr('key', '==', 'database') | list | length > 0 }}"

roles/gitlab/tasks/configure.yml

@@ -17,6 +17,7 @@
   no_log: "{{ gitlab_hide_sensitive_changes }}"
   notify:
     - "Reconfigure Primary GitLab"
+    - "Run registry metadata database migrations"
     - "Reconfigure Non Primary GitLab"
 
 - name: "Ensure gitaly['configuration'] is not present in gitlab_additional_configurations"
@@ -55,6 +56,7 @@
   no_log: "{{ gitlab_hide_sensitive_changes }}"
   notify:
     - "Reconfigure Primary GitLab"
+    - "Run registry metadata database migrations"
     - "Reconfigure Non Primary GitLab"
 
 - name: "Create file to prevent Gitlab to restart before migrations"

roles/gitlab/tasks/main.yml

@@ -8,19 +8,8 @@
 - name: "Set OS distribution dependent variables"
   ansible.builtin.include_vars: "{{ ansible_facts.distribution }}.yml"
 
-- name: "Check whether gitlab-rails binary is installed"
-  ansible.builtin.stat:
-    path: "/usr/bin/gitlab-rails"
-  register: "gitlab_rails_binary"
-
-- name: "Determine if this is an initial dry-run"
-  ansible.builtin.set_fact:
-    gitlab_is_initial_dryrun: "{{ ansible_check_mode and not gitlab_rails_binary.stat.exists }}"
-
-- name: "Check if a previous reconfigure had failed"
-  ansible.builtin.stat:
-    path: "/etc/gitlab/reconfigure_failed"
-  register: "gitlab_reconfigure_failed"
+- name: "Perform prerequisite checks"
+  ansible.builtin.import_tasks: "check.yml"
 
 - name: "Reconfigure GitLab"
   ansible.builtin.import_tasks: "reconfigure.yml"

roles/gitlab/tasks/reconfigure.yml

@@ -21,6 +21,14 @@
   when:
     - "not gitlab_is_primary"
 
+- name: "Run registry metadata database migrations"
+  become: true
+  ansible.builtin.command: "gitlab-ctl registry-database migrate up --skip-post-deployment"
+  changed_when: true
+  when:
+    - "__gitlab_registry_database_used"
+    - "gitlab_is_primary"
+
 - name: "Remove file that indicates a failed reconfigure"
   ansible.builtin.file:
     path: "/etc/gitlab/reconfigure_failed"