Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fixes labels and annotations #441

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

jared-schmidt-niceincontact
Copy link

@jared-schmidt-niceincontact jared-schmidt-niceincontact commented May 15, 2023

Provide a description of what has been changed
Labels and annotations have been fixed throughout the templates so that they actually work. The "annotation" key in the metadata is included or excluded depending on if it has content. The "{}" in several of the annotation overrides in the values.yaml file was causing the "helm template" command to break when a value was defined in an external values.yaml file. This bug has also been fixed. Several whitespace gobbling issues have been fixed where labels and annotations were being appended to the previous line.

Checklist

  • I have verified that my change is according to the deprecations & breaking changes policy
  • Commits are signed with Developer Certificate of Origin (DCO - learn more)
  • README is updated with new configuration values (if applicable)
  • A PR is opened to update KEDA core (repo) (if applicable, ie. when deployment manifests are modified)

Fixes #
#437

Signed-off-by: Jared Schmidt <jared.schmidt@nice.com>
Copy link
Contributor

@mkilchhofer mkilchhofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additional if you change keys inside values.yaml you need to also adapt the README.md

Comment on lines +273 to +274
# annotations:
# foo: bar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't comment-out the key.

Comment on lines +136 to +137
# annotations:
# foo: bar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't comment-out the key.

Comment on lines +112 to +113
# additionalAnnotations:
# foo: bar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't comment-out the key.

Comment on lines +108 to +109
# additionalLabels:
# foo: bar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't comment-out the key.

Comment on lines -402 to +401
relabellings: []
relabelings: []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kinda breaking. But if we accept this, this change needs to be reflected into the 3 servicemonitor.yaml files:

  • templates/manager/servicemonitor.yaml
  • templates/webhooks/servicemonitor.yaml
  • templates/metrics-server/servicemonitor.yaml

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, we should not break this

Comment on lines -379 to +378
relabellings: []
relabelings: []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kinda breaking. But if we accept this, this change needs to be reflected into the 3 servicemonitor.yaml files:

  • templates/manager/servicemonitor.yaml
  • templates/webhooks/servicemonitor.yaml
  • templates/metrics-server/servicemonitor.yaml

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, we should not break this

Copy link
Member

@tomkerkhove tomkerkhove left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I have the same comments such as @mkilchhofer. Please process them and also undo all changes in the values file wrt commenting things

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants