Move array deprecation to additional_deprecations

This commit is contained in:
Jaime Martinez 2024-05-06 12:08:58 +10:00
parent eba79b0916
commit cbf0d7f3a2
No known key found for this signature in database
1 changed files with 8 additions and 7 deletions

View File

@ -363,13 +363,7 @@ module Gitlab
note: "`omnibus_gitconfig` will be removed in GitLab 17.0. For details and migration instructions, please see: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#gitlabomnibus_gitconfig-deprecation"
},
{
config_keys: %w(gitlab registry notifications endpoint threshold),
deprecation: '17.0',
removal: '18.0',
note: "Starting with GitLab 18.0, `registry['notifications']['endpoint']['threshold'] will be removed. Please use `maxretries` instead https://gitlab.com/gitlab-org/container-registry/-/issues/1243."
},
{
config_keys: %w(gitlab registry default_notifications_threshold),
config_keys: %w(registry default_notifications_threshold),
deprecation: '17.0',
removal: '18.0',
note: "Starting with GitLab 18.0, `registry['default_notifications_threshold'] will be removed. Please use `default_notifications_maxretries` instead https://gitlab.com/gitlab-org/container-registry/-/issues/1243."
@ -618,6 +612,13 @@ module Gitlab
EOS
messages += deprecate_only_if_value(incoming_version, existing_config, type, ['monitoring', 'grafana'], 'enable', true, '16.0', '16.3', note: grafana_note)
notifications_threshold_note = <<~EOS
Starting with GitLab 18.0, `registry['notifications']['endpoint']['threshold'] will be removed.
Please use `maxretries` instead https://gitlab.com/gitlab-org/container-registry/-/issues/1243.
EOS
messages += deprecate_only_if_value(incoming_version, existing_config, type, ['registry', 'notifications'],'endpoint','threshold',17.0, 18.0, note: notifications_threshold_note)
messages
end