Skip to content

Conversation

@jpinsonneau
Copy link
Contributor

@jpinsonneau jpinsonneau commented Jul 28, 2025

Description

Implement a new loki mode Dev that deploy the zero click loki.

Also took the opportunity to update the config to rely on latest release using tsdb.

TODOs:

  • move that new mode inside monolithic config
  • expose loki uri in CSV
    • that will allow us to change it downstream to registry.redhat.io/openshift-logging/logging-loki-rhel9:v3.4.3 without effort
    • config.file is exposed as container ARG to support downstream image

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
    • If so, make sure the JIRA epic is labeled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
    • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
    • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
    • Standard QE validation, with pre-merge tests unless stated otherwise.
    • Regression tests only (e.g. refactoring with no user-facing change).
    • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

@jpinsonneau jpinsonneau requested review from jotak and stleerh July 28, 2025 10:08
@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jul 30, 2025
@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:07f9391
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-07f9391
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-07f9391

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:07f9391 make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-07f9391

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-07f9391
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jul 30, 2025
@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jul 30, 2025
@jpinsonneau
Copy link
Contributor Author

Updated bundle

@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:0492b4c
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-0492b4c
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-0492b4c

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:0492b4c make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-0492b4c

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-0492b4c
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@jpinsonneau jpinsonneau changed the title Loki dev mode NETOBSERV-2360 Loki dev mode Aug 1, 2025
@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Aug 5, 2025
@jpinsonneau jpinsonneau added the needs-review Tells that the PR needs a review label Aug 7, 2025
@memodi
Copy link
Member

memodi commented Sep 12, 2025

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Sep 12, 2025
@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:7ea9054
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-7ea9054
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-7ea9054

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:7ea9054 make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-7ea9054

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-7ea9054
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Sep 25, 2025
@jpinsonneau
Copy link
Contributor Author

Rebased without changes

@openshift-ci
Copy link

openshift-ci bot commented Dec 11, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jpinsonneau for approval. For more information see the Code Review Process.

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

Details 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

@mffiedler
Copy link

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 11, 2025
@Amoghrd Amoghrd removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 11, 2025
@Amoghrd
Copy link
Member

Amoghrd commented Dec 11, 2025

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 11, 2025
@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 11, 2025
@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 11, 2025
@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:e902b6c
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-e902b6c
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-e902b6c

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:e902b6c make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-e902b6c

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-e902b6c
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@memodi
Copy link
Member

memodi commented Dec 11, 2025

e2e-operator test is failing here with FLP not being able to come ready, does the test needs to be updated or something that needs be updated in PR?

name: console-plugin
- image: quay.io/netobserv/network-observability-console-plugin:v1.10.0-community-pf4
name: console-plugin-compat
- image: grafana/loki:3.5.0
Copy link
Member

Choose a reason for hiding this comment

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

I'm still pretty sure this is going to fail konflux validation of the related images, as this isn't an approved registry

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The corresponding image downstream should be https://catalog.redhat.com/en/software/containers/openshift-logging/logging-loki-rhel9/64479926a759a6e51ef79b12

I need to test it to see how it goes 🤔

Maybe we should make this configurable so we don't force a specific container image and default to the logging one if it works fine ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

By the way, all of our upstream content points to quay.io so I don't see the issue here.
If you don't want to point grafana/loki image, I can copy it under quay.io/netobserv but that should be the exact same image upstream.
Konflux should replace that image downstream (by the logging one or another we build ourself).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I confirm it works with image registry.redhat.io/openshift-logging/logging-loki-rhel9:v3.5.7 👌

Copy link
Member

Choose a reason for hiding this comment

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

By the way, all of our upstream content points to quay.io so I don't see the issue here.
If you don't want to point grafana/loki image, I can copy it under quay.io/netobserv but that should be the exact same image upstream.

Sorry I didn't mean that, for upstream it's ok to have the grafana image, my concern really is about how that would work downstream. See next point:

Konflux should replace that image downstream (by the logging one or another we build ourself).

It's actually something done here: https://github.com/netobserv/network-observability-operator/blob/main/hack/patch_csv.py#L82-L90 So we need to update that file for Loki.

It's nice that logging-loki-rhel9 works as a drop-in replacement, so we can reference it there, but then we need to see how that will work with konflux & renovate: if renovate is able to update it, we can use a pinned digest; if renovate cannot do it then I guess we should use a stream reference (3.5 currently) but that means having to regularly check for updates manually. (And I'm not sure if konflux will accept the non-digest version). Last option could be to disable the feature for downstream builds.

Copy link
Member

Choose a reason for hiding this comment

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

(I'm asking renovate folks in slack)

@jotak
Copy link
Member

jotak commented Dec 12, 2025

IMO there should be a systematic warning triggered by the validation webhook, that this isn't supported. Or maybe, at least when there's the DOWNSTREAM_DEPLOYMENT flag (it's ok for upstream)

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 12, 2025
@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 15, 2025
@jpinsonneau
Copy link
Contributor Author

  • Rebased
  • Renamed zeroClick to demoLoki
  • Disabled by default

@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:59555bd
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-59555bd
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-59555bd

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:59555bd make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-59555bd

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-59555bd
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 15, 2025
@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Dec 15, 2025
@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:1791d6e
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-1791d6e
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-1791d6e

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:1791d6e make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-sha-1791d6e

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-sha-1791d6e
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@openshift-ci
Copy link

openshift-ci bot commented Dec 15, 2025

@jpinsonneau: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-operator 9c02b44 link false /test e2e-operator

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@jpinsonneau jpinsonneau requested a review from jotak December 17, 2025 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-review Tells that the PR needs a review ok-to-test To set manually when a PR is safe to test. Triggers image build on PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants