Merge branch '1071-support-registry-database-config' into 'master'

Add config support for container registry database

Closes #1071

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7100

Merged-by: Robert Marshall <[email protected]>
Approved-by: Jaime Martinez <[email protected]>
Approved-by: Hayley Swimelar <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Reviewed-by: Jaime Martinez <[email protected]>
Co-authored-by: Suleimi Ahmed <[email protected]>
Co-authored-by: Jaime Martinez <[email protected]>

Author: 3 people

files/gitlab-config-template/gitlab.rb.template

@@ -909,6 +909,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # registry['validation_enabled'] = false
 # registry['autoredirect'] = false
 # registry['compatibility_schema1_enabled'] = false
+# registry['database'] = nil
 
 ### Registry backend storage
 ###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html#configure-storage-for-the-container-registry
@@ -925,6 +926,29 @@ external_url 'GENERATED_EXTERNAL_URL'
 #   }
 # }
 
+### Registry database
+###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html?tab=Linux+package+%28Omnibus%29#configure-a-metadata-database-for-the-container-registry
+# registry['database'] = { 
+#   'enabled' => true,
+#   'host' => 'localhost',
+#   'port' => 5432,
+#   'user' => 'postgres',
+#   'password' => 'postgres',
+#   'dbname' => 'registry',
+#   'sslmode' => 'verify-full',
+#   'sslcert' => '/path/to/client.crt',
+#   'sslkey' => '/path/to/client.key',
+#   'sslrootcert' => '/path/to/root.crt',
+#   'connecttimeout' => '5s',
+#   'draintimeout' => '2m',
+#   'preparedstatements' => false,
+#   'pool' => {
+#       'maxidle' => 25,
+#       'maxopen' => 25,
+#       'maxlifetime' => '5m'
+#   } 
+# }
+
 ### Registry notifications endpoints
 # registry['notifications'] = [
 #   {

files/gitlab-cookbooks/registry/attributes/default.rb

@@ -36,6 +36,7 @@
 default['registry']['validation_enabled'] = false
 default['registry']['autoredirect'] = false
 default['registry']['compatibility_schema1_enabled'] = false
+default['registry']['database'] = nil
 
 ####
 # Notifications

files/gitlab-cookbooks/registry/templates/default/registry-config.yml.erb

@@ -44,3 +44,6 @@ compatibility:
 notifications:
   endpoints: <%= @notifications.to_json %>
 <% end %>
+<% if @database %>
+database: <%= @database.to_json %>
+<% end %>

spec/chef/cookbooks/registry/recipes/registry_spec.rb

@@ -142,6 +142,36 @@
       end
     end
 
+    context 'when the registry metadata database is enabled' do
+      let(:database_config) do
+        { "enabled" => true,
+          "host" => "localhost",
+          "port" => 5432,
+          "user" => "postgres",
+          "password" => "postgres",
+          "dbname" => "registry",
+          "sslmode" => "verify-full",
+          "sslcert" => "/path/to/client.crt",
+          "sslkey" => "/path/to/client.key",
+          "sslrootcert" => "/path/to/root.crt",
+          "connecttimeout" => "5s",
+          "draintimeout" => "2m",
+          "preparedstatements" => false,
+          "pool" => {
+            "maxidle" => 25,
+            "maxopen" => 25,
+            "maxlifetime" => "5m"
+          } }
+      end
+
+      before { stub_gitlab_rb(registry: { database: database_config }) }
+
+      it 'creates registry config with database' do
+        expect(chef_run).to render_file('/var/opt/gitlab/registry/config.yml')
+          .with_content(%r(^database: {"enabled":true))
+      end
+    end
+
     context 'when a log formatter is specified' do
       before { stub_gitlab_rb(registry: { log_formatter: 'json' }) }
 

spec/chef/support/shared_examples/registry_service.rb

@@ -62,6 +62,7 @@
         expect(content).to match(/validation:\s*disabled: true$/)
         expect(content).not_to match(/^compatibility:/)
         expect(content).not_to match(/^middleware:/)
+        expect(content).not_to match(/^database:/)
       end
     )
   end