Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus] Unify labels and annotations #23689

Closed
wants to merge 1 commit into from

Conversation

hmlkao
Copy link
Contributor

@hmlkao hmlkao commented Sep 4, 2020

Is this a new chart

No

What this PR does / why we need it:

This PR unify labels and annotations across all deploymets and statefulsets in stable/prometheus Helm chart
+ removed useless trailing pipe chars (|) in README.md

Checklist

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 4, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hmlkao
To complete the pull request process, please assign xtigyro
You can assign the PR to them by writing /assign @xtigyro in a comment when ready.

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

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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 4, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @hmlkao. Thanks for your PR.

I'm waiting for a helm 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.

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/test-infra repository.

@hmlkao
Copy link
Contributor Author

hmlkao commented Sep 4, 2020

/assign @Xtigyro

{{- end }}
labels:
{{- include "prometheus.server.labels" . | nindent 8 }}
{{- if .Values.server.statefulSet.labels}}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed according to current Deployment template.

.Values.server.statefulSet.labels is used to add labels to StatefulSet itself, not pods.

@Xtigyro
Copy link
Collaborator

Xtigyro commented Sep 4, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 4, 2020
Copy link
Collaborator

@Xtigyro Xtigyro left a comment

Choose a reason for hiding this comment

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

@hmlkao Thanks for the contribution!

Could you please add all the deploymentAnnotations in the values.yaml file?

@Xtigyro
Copy link
Collaborator

Xtigyro commented Sep 4, 2020

@hmlkao Also - we're in the middle of a transition to a new repo for the Prometheus Helm charts. Where would you like this PR to be merged - here or in the new repo (https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus)?

@scottrigby
Copy link
Member

See #23692. We're ready to deprecate stable/prometheus in favor of the new repo. Can this PR please be opened over there instead?

@Xtigyro
Copy link
Collaborator

Xtigyro commented Sep 5, 2020

@hmlkao The only option has become the new repo. Please open the same PR there if it's okay for ya. Apologies for the double effort!

@scottrigby Agreed.

@scottrigby scottrigby closed this Sep 5, 2020
@hmlkao
Copy link
Contributor Author

hmlkao commented Sep 5, 2020

Well, I've created PR in new repo and add requested additions
prometheus-community/helm-charts#45

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). ok-to-test size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants