Merge branch 'feat/support-registry-gc-config' into 'master'

Add config support for container registry garbage collection

Closes #8438

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

Merged-by: Ian Baum <[email protected]>
Approved-by: Mitchell Nielsen <[email protected]>
Approved-by: Ian Baum <[email protected]>
Reviewed-by: Ian Baum <[email protected]>
Co-authored-by: Fabio Huser <[email protected]>

Author: ibaum

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

@@ -1023,6 +1023,25 @@ external_url 'GENERATED_EXTERNAL_URL'
 #   }
 # }
 
+### Registry garbage collection
+###! Docs: https://gitlab.com/gitlab-org/container-registry/-/blob/master/docs/configuration.md?ref_type=heads#gc
+# registry['gc'] = { 
+#   'disabled' => false,
+#   'maxbackoff' => '24h',
+#   'noidlebackoff' => false,
+#   'transactiontimeout' => '10s',
+#   'reviewafter' => '24h',
+#   'manifests' => {
+#       'disabled' => false,
+#       'interval' => '5s'
+#   },
+#   'blobs' => {
+#       'disabled' => false,
+#       'interval' => '5s',
+#       'storagetimeout' => '5s'
+#   }
+# }
+
 ### Registry notifications endpoints
 # registry['notifications'] = [
 #   {

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

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

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

@@ -47,3 +47,6 @@ notifications:
 <% if @database %>
 database: <%= @database.to_json %>
 <% end %>
+<% if @gc %>
+gc: <%= @gc.to_json %>
+<% end %>

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

@@ -173,6 +173,32 @@
       end
     end
 
+    context 'when the registry garbage collector configuration is present' do
+      let(:gc_config) do
+        { "disabled" => false,
+          "maxbackoff" => "24h",
+          "noidlebackoff" => false,
+          "transactiontimeout" => "10s",
+          "reviewafter" => "24h",
+          "manifests" => {
+            "disabled" => false,
+            "interval" => "5s"
+          },
+          "blobs" => {
+            "disabled" => false,
+            "interval" => "5s",
+            "storagetimeout" => "5s"
+          } }
+      end
+
+      before { stub_gitlab_rb(registry: { gc: gc_config }) }
+
+      it 'creates registry config with gc' do
+        expect(chef_run).to render_file('/var/opt/gitlab/registry/config.yml')
+          .with_content(%r(^gc: {"disabled":false))
+      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

@@ -63,6 +63,7 @@
         expect(content).not_to match(/^compatibility:/)
         expect(content).not_to match(/^middleware:/)
         expect(content).not_to match(/^database:/)
+        expect(content).not_to match(/^gc:/)
       end
     )
   end