Skip to content

Skip configure rake task if container registry is misconfigured

João Pereira requested to merge 204839-dont-raise-in-rake-task into master

What does this MR do?

Context

As part of #204839 (closed), in !31697 (merged) a new rake task (gitlab:container_registry:configure) was added to detect the Container Registry vendor, version and supported features on self-managed instances. This rake task will be called from Omnibus and Helm install (see thread in #204839 (comment 303690140) for additional context).

Problem

Following feedback from the Distribution team (gitlab-org/distribution/team-tasks#657 (comment 347637577)), we should not raise an error in the rake task if the registry is disabled or misconfigured. Instead we should do nothing.

Solution

Instead of raising an error, simply log a warning message and return earlier. It's OK to leave the columns in application_settings unchanged in this situation, as they have sane defaults (see !31125 (diffs)).

Related to #204839 (closed).

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by João Pereira

Merge request reports

Loading