NETOBSERV-764: conversion fallback on ingester url

[jpinsonneau]

Description

This PR fix the empty loki querier url issue in conversion webhook

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 labelled 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).

[openshift-ci-robot]

@jpinsonneau: This pull request references NETOBSERV-764 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Description

This PR fix the empty loki querier url issue in conversion webhook

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 labelled 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).

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/test-infra repository.

[Amoghrd]

Think this is a simple fix, can be merged without QE testing. wdyt @nathan-weinberg?

[nathan-weinberg]

@Amoghrd agreed, but if it's alright with @jpinsonneau I want to check out some other modes as well before merging this in case we need any other changes!

[codecov]

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (fc1c80c) 54.93% compared to head (5516002) 55.10%.

❗ Current head 5516002 differs from pull request most recent head 6645d06. Consider uploading reports for the commit 6645d06 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #481      +/-   ##
==========================================
+ Coverage   54.93%   55.10%   +0.16%     
==========================================
  Files          49       49              
  Lines        6449     6453       +4     
==========================================
+ Hits         3543     3556      +13     
+ Misses       2662     2657       -5     
+ Partials      244      240       -4     

Flag	Coverage Δ
unittests	55.10% <0.00%> (+0.16%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
api/v1beta1/flowcollector_webhook.go	0.00% <0.00%> (ø)

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[nathan-weinberg]

/ok-to-test

[github-actions]

New images:

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

They will expire after two weeks.

To deploy this build:

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

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

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-e2bdef6
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

[nathan-weinberg]

I deployed the premerge image of the operator using the same v1beta1 CRD as Amogh and pods came up and seem to be processing flows/generating graphs, this is how the conversion func handled the conversion to v1beta2 for the relevant loki section

  loki:
    timeout: 10s
    microservices:
      ingesterUrl: 'http://loki-distributor:3100/'
      querierUrl: 'http://loki-query-frontend:3100/'
      tenantID: netobserv
      tls:
        caCert: {}
        userCert: {}
    maxRetries: 2
    enable: true
    mode: Manual
    maxBackoff: 5s
    manual:
      authToken: FORWARD
      ingesterUrl: >-
        https://lokistack-gateway-http.netobserv.svc.cluster.local:8080/api/logs/v1/network/
      querierUrl: >-
        https://lokistack-gateway-http.netobserv.svc.cluster.local:8080/api/logs/v1/network/
      statusTls:
        caCert: {}
        userCert: {}
      tenantID: network
      tls:
        caCert:
          certFile: service-ca.crt
          name: lokistack-gateway-ca-bundle
          type: configmap
        enable: true
        userCert: {}
    lokiStack:
      name: loki
    staticLabels:
      app: netobserv-flowcollector
    monolithic:
      tenantID: netobserv
      tls:
        caCert: {}
        userCert: {}
      url: 'http://loki:3100/'
    batchWait: 1s
    minBackoff: 1s
    batchSize: 10485760

[nathan-weinberg]

/label qe-approved

[openshift-ci-robot]

@jpinsonneau: This pull request references NETOBSERV-764 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Description

This PR fix the empty loki querier url issue in conversion webhook

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 labelled 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).

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/test-infra repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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

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

[jpinsonneau]

Thanks @nathan-weinberg & @Amoghrd
Let's merge !