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

Add serviceMonitor.labels parameter #1419

Merged
merged 1 commit into from
Oct 7, 2022

Conversation

torredil
Copy link
Member

@torredil torredil commented Oct 6, 2022

What is this PR about? / Why do we need it?

What testing is done?

  • Rendered Helm chart.

Signed-off-by: Eddie Torres [email protected]

@torredil torredil requested review from ConnorJC3 and gtxu October 6, 2022 18:29
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 6, 2022
@k8s-ci-robot k8s-ci-robot requested a review from rdpsin October 6, 2022 18:30
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 6, 2022
@ConnorJC3
Copy link
Contributor

/hold for other reviews
/lgtm

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 6, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 6, 2022
@gtxu
Copy link
Contributor

gtxu commented Oct 6, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2022
@torredil
Copy link
Member Author

torredil commented Oct 7, 2022

Addressing #1420 in this PR.

  • .Values.controller.serviceMonitor.forceEnable = true & CRDs not installed.
$ helm template ./ | grep -A 20 "monitoring.coreos.com/v1"

apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
  name: ebs-csi-controller
  namespace: default
  labels:
    app: ebs-csi-controller
    release: prometheus
spec:
  selector:
    matchLabels:
      app: ebs-csi-controller
  namespaceSelector:
    matchNames:
      - default
  endpoints:
    - targetPort: 3301
      path: /metrics
      interval: 15s
  • .Values.controller.serviceMonitor.forceEnable = false & CRDs not installed.
$ helm template ./ | grep -A 20 "monitoring.coreos.com/v1"

charts/aws-ebs-csi-driver/templates/metrics.yaml Outdated Show resolved Hide resolved
charts/aws-ebs-csi-driver/templates/metrics.yaml Outdated Show resolved Hide resolved
Add serviceMonitor.forceEnable parameter

Signed-off-by: Eddie Torres <[email protected]>
@gtxu gtxu self-requested a review October 7, 2022 17:06
Copy link
Contributor

@ConnorJC3 ConnorJC3 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ConnorJC3, gtxu, torredil

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [ConnorJC3,gtxu,torredil]

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

@ConnorJC3
Copy link
Contributor

/remove-hold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 7, 2022
@k8s-ci-robot k8s-ci-robot merged commit 4c88b87 into kubernetes-sigs:master Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[helm] Don't check capabilities when enableMetrics: true
4 participants