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

feat: ability to add additional labels to serviceMonitor #316

Merged
merged 1 commit into from
Jul 13, 2022

Conversation

dotdc
Copy link
Contributor

@dotdc dotdc commented Jul 13, 2022

Signed-off-by: David davidcalvertfr@gmail.com

Description

Added the ability to add additional labels to the serviceMonitor in the helm chart.
This is required if you use a custom serviceMonitorSelector in kube-prometheus-stack :

    serviceMonitorSelector:
      matchLabels:
        mycustomlabel: somevalue

Source: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L2394

I didn't created an associated issue because I consider this to be a trivial fix, but can create one if needed.
As I'm not sure about the release process, I didn't increase the chart version.
Let me know if I need to increment the semver or do something else.

David

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

Signed-off-by: David <davidcalvertfr@gmail.com>
@dotdc
Copy link
Contributor Author

dotdc commented Jul 13, 2022

The CI fails, but doesn't seems related to my patch:

[It] check requeue interval bigger then 0
/home/runner/work/trivy-operator/trivy-operator/pkg/compliance/clustercompliancereport_test.go:88
Expected
      <bool>: false
  to be true
In [It] at: /home/runner/work/trivy-operator/trivy-operator/pkg/compliance/clustercompliancereport_test.go:92
------------------------------
•••
Ran 6 of 6 Specs in 4.149 seconds
FAIL! -- 5 Passed | 1 Failed | 0 Pending | 0 Skipped[It] check requeue interval bigger then 0
/home/runner/work/trivy-operator/trivy-operator/pkg/compliance/clustercompliancereport_test.go:88
Expected
      <bool>: false
  to be true
In [It] at: /home/runner/work/trivy-operator/trivy-operator/pkg/compliance/clustercompliancereport_test.go:92
------------------------------
•••
Ran 6 of 6 Specs in 4.149 seconds
FAIL! -- 5 Passed | 1 Failed | 0 Pending | 0 Skipped

@erikgb
Copy link
Contributor

erikgb commented Jul 13, 2022

I think this is a flake that I have seen before. @josedonizetti?

@chen-keinan
Copy link
Contributor

chen-keinan commented Jul 13, 2022

@dotdc will trigger it again , if it pass I will open an issue for this test

@chen-keinan chen-keinan merged commit 661a31e into aquasecurity:main Jul 13, 2022
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