Skip to content

Fix cert-manager Issuer rendering annotations: null and wire documented Certificate annotations/labels#1825

Open
yugstar wants to merge 2 commits into
kubernetes-sigs:masterfrom
yugstar:fix-certmanager-issuer-annotations-null
Open

Fix cert-manager Issuer rendering annotations: null and wire documented Certificate annotations/labels#1825
yugstar wants to merge 2 commits into
kubernetes-sigs:masterfrom
yugstar:fix-certmanager-issuer-annotations-null

Conversation

@yugstar

@yugstar yugstar commented Jun 17, 2026

Copy link
Copy Markdown

Summary

Two related fixes in charts/metrics-server/templates/certificate.yaml (only triggered when tls.type=cert-manager):

1. Issuer renders annotations: null (bug)

The Issuer metadata referenced .Values.additionalAnnotations, which does not exist anywhere in values.yaml. So helm template --set tls.type=cert-manager rendered:

kind: Issuer
metadata:
  annotations:
    null

This is the same annotations: null → GitOps OutOfSync footgun that was already fixed for the APIService template in #1752. I removed the broken block (the value never existed, so there is no behavior to preserve).

2. tls.certManager.annotations / tls.certManager.labels were dead values

values.yaml declares tls.certManager.annotations and tls.certManager.labels, and the README documents them as "Add extra annotations/labels to the Certificate resource" — but they were never wired to the Certificate. This applies them (guarded with with), so the documented values actually take effect.

Verification

  • helm template --set tls.type=cert-manager → Issuer no longer renders annotations: null (no stray null anywhere).
  • --set tls.certManager.annotations.foo=bar --set tls.certManager.labels.team=infra → both now appear on the Certificate.
  • Default render otherwise unchanged; helm lint passes.
  • Per CONTRIBUTING.md, Chart.yaml is intentionally left unmodified; the change is recorded under CHANGELOG.md [UNRELEASED].

yugstar added 2 commits June 18, 2026 00:58
…ate annotations/labels

The cert-manager Issuer in certificate.yaml referenced a non-existent
`.Values.additionalAnnotations`, so with tls.type=cert-manager the
Issuer rendered `metadata.annotations: null` — the same GitOps
OutOfSync footgun already fixed for the APIService template (kubernetes-sigs#1752).
Remove that broken block.

Additionally, `tls.certManager.annotations` and
`tls.certManager.labels` are declared in values.yaml and documented in
the README ('Add extra annotations/labels to the Certificate resource')
but were never wired to the Certificate. Apply them (guarded), so the
documented values work.

Per CONTRIBUTING, Chart.yaml is intentionally left unchanged; entry
added under CHANGELOG [UNRELEASED].

Signed-off-by: Aman Raj <aman.yug@gmail.com>
Signed-off-by: Aman Raj <aman.yug@gmail.com>
@linux-foundation-easycla

linux-foundation-easycla Bot commented Jun 17, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: yugstar
Once this PR has been reviewed and has the lgtm label, please assign stevehipwell for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Jun 17, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

This issue is currently awaiting triage.

If metrics-server contributors determine this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: yugstar
Once this PR has been reviewed and has the lgtm label, please assign stevehipwell for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Welcome @yugstar!

It looks like this is your first PR to kubernetes-sigs/metrics-server 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/metrics-server has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @yugstar. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 17, 2026
@github-project-automation github-project-automation Bot moved this to Needs Triage in SIG Instrumentation Jun 17, 2026
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

Status: Needs Triage

Development

Successfully merging this pull request may close these issues.

2 participants