Skip to content

Conversation

@fl64
Copy link
Member

@fl64 fl64 commented Oct 31, 2025

Description

Switched metrics scraping for the virtualization-controller from ScrapeConfig to ServiceMonitor.

Why do we need it, and what problem does it solve?

What is the expected result?

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

Changelog entries

section: module
type: chore 
summary: Switched metrics scraping for the virtualization-controller from ScrapeConfig to ServiceMonitor.
impact_level: low

@sourcery-ai
Copy link
Contributor

sourcery-ai bot commented Oct 31, 2025

Reviewer's Guide

This PR removes the legacy scrapeconfig integration by adding a native Prometheus ServiceMonitor template in the virtualization-controller Helm chart, conditioned on the operator-prometheus-crd module, and configures secure endpoints with proper labeling and namespace selection.

Class diagram for ServiceMonitor resource structure

classDiagram
  class ServiceMonitor {
    +metadata: name, namespace, labels
    +spec: endpoints, namespaceSelector, selector
  }
  class Endpoint {
    +bearerTokenSecret: key, name
    +path: /metrics
    +port: metrics
    +scheme: https
    +tlsConfig: insecureSkipVerify
  }
  class NamespaceSelector {
    +matchNames: [d8-<Chart.Name>]
  }
  class Selector {
    +matchLabels: app: virtualization-controller
  }
  ServiceMonitor "1" -- "*" Endpoint : endpoints
  ServiceMonitor "1" -- "1" NamespaceSelector : namespaceSelector
  ServiceMonitor "1" -- "1" Selector : selector
Loading

File-Level Changes

Change Details Files
Introduce ServiceMonitor CRD for virtualization-controller in place of scrapeconfig
  • Guard resource creation with operator-prometheus-crd module flag
  • Define ServiceMonitor spec with bearerToken auth, metrics port, HTTPS scheme, and insecureSkipVerify
  • Apply standardized labels via helm_lib_module_labels helper
  • Set namespaceSelector to target d8- namespace
  • Configure selector to match app=virtualization-controller
templates/virtualization-controller/service-monitor.yaml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@fl64 fl64 force-pushed the chore/module/get-rid-of-scrapeconfig branch 2 times, most recently from dc7da4f to 2ecbc5e Compare November 11, 2025 07:02
@fl64 fl64 changed the title chore(module): get rid of scrapeconfig chore(module): get rid of scrapeconfig and use servicemonitor to scrape virtualization-controller metrics Nov 11, 2025
@fl64 fl64 force-pushed the chore/module/get-rid-of-scrapeconfig branch 2 times, most recently from 9fd27cb to d91ec13 Compare November 11, 2025 12:22
@fl64 fl64 changed the title chore(module): get rid of scrapeconfig and use servicemonitor to scrape virtualization-controller metrics chore(module): switched metrics scraping for the virtualization-controller from scrapeconfig to servicemonitor Nov 11, 2025
@fl64 fl64 added this to the v1.2.0 milestone Nov 11, 2025
@fl64 fl64 force-pushed the chore/module/get-rid-of-scrapeconfig branch 2 times, most recently from 345e46e to 5a5887f Compare November 12, 2025 05:37
fl64 added 7 commits November 12, 2025 10:52
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
@fl64 fl64 force-pushed the chore/module/get-rid-of-scrapeconfig branch 3 times, most recently from b1604f8 to 3294d14 Compare November 12, 2025 13:40
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