Fix certmanager annotation regression in Helm 3.20.1

Clemens Beckrequested to merge
cb-certmanager-pluck-fix into master

What does this MR do?

Fix certmanager annotation regression in Helm 3.20.1

A recent change in Helm 3.20.1 broke our usage of pluck. Helm 4 is not impacted.

We can workaround this by explictly checking for nil values instead of using pluck until this is fixed upstream: https://github.com/helm/helm/issues/31971

Relates #6366

Changelog: fixed

Related issues

Author checklist

For general guidance, please follow our Contributing guide.

Test Plan

Confirm that the certmanager annotations are rendered with Helm 3.20.0, 3.20.1, and 4.1.3:

$ helm version && \
  helm template . \
    --set certmanager-issuer.email=test \
    -s charts/gitlab/charts/webservice/templates/ingress.yaml | grep cert

Required

For anything in this list which will not be completed, please provide a reason in the MR discussion.

  • Merge Request Title and Description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • MR has a green pipeline.
  • Documentation created/updated.
  • Tests added/updated, and test plan for scenarios not covered by automated tests.
  • Equivalent MR/issue for omnibus-gitlab opened.

Reviewers checklist

Edited by Clemens Beck

Merge request reports