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 wrong namespaceSelector in servicemonitor #127

Merged
merged 1 commit into from
Aug 8, 2023
Merged

fix wrong namespaceSelector in servicemonitor #127

merged 1 commit into from
Aug 8, 2023

Conversation

tulequ
Copy link
Contributor

@tulequ tulequ commented Jul 5, 2023

Why is this pull request needed and what does it do?

when set prometheus.monitor.namespace to differ namespace, we should use namespaceSelector to specify service namespace

Which issues (if any) are related?

Checklist:

  • I have bumped the chart version according to versioning.
  • I have updated the chart changelog with all the changes that come with this pull request according to changelog.
  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.

Changes are automatically published when merged to main. They are not published on branches.

Note on DCO

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

@hagaibarel
Copy link
Collaborator

Not sure I understand the change, shouldn't the namespace selector always be the release namespace? In what cases should the service monitor be targeting a different namespace?

@tulequ
Copy link
Contributor Author

tulequ commented Jul 6, 2023

Because some prometheus is deployed with servicemonitor namespace to monitoring only (I don't think it is good, but it is historical)

I give some example
https://github.com/kubernetes/ingress-nginx/blob/main/charts/ingress-nginx/templates/controller-servicemonitor.yaml#L31-L37 (this is complex :)) )
https://github.com/bitnami/charts/blob/main/bitnami/redis/templates/servicemonitor.yaml#L43-L45
https://github.com/bitnami/charts/blob/main/bitnami/rabbitmq/templates/servicemonitor.yaml#L51-L53

@hagaibarel
Copy link
Collaborator

hagaibarel commented Jul 6, 2023

Alright, sounds reasonable, please fill out all the items in the PR checklist and we can get this rolling (e.g. DCO)

@hagaibarel hagaibarel self-requested a review July 9, 2023 06:33
charts/coredns/Chart.yaml Outdated Show resolved Hide resolved
@hagaibarel
Copy link
Collaborator

@tulequ the DCO check is failing, please resolve

@hagaibarel
Copy link
Collaborator

Seems like the DCO check is still failing, please fix so we can merge this

@tulequ
Copy link
Contributor Author

tulequ commented Aug 8, 2023

please check again

@hagaibarel hagaibarel merged commit d368302 into coredns:master Aug 8, 2023
2 checks passed
@hagaibarel
Copy link
Collaborator

Thanks!

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.

2 participants