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

NETOBSERV-1647: Do not load loki cert when loki disabled [Backport 1.6] #670

Merged
merged 2 commits into from
Jun 6, 2024

Conversation

jotak
Copy link
Member

@jotak jotak commented Jun 5, 2024

cf #669

also includes backport of #662 to fix flaky CI

@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Jun 5, 2024

@jotak: This pull request references NETOBSERV-1647 which is a valid jira issue.

In response to this:

cf #669

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

codecov bot commented Jun 5, 2024

Codecov Report

Attention: Patch coverage is 66.66667% with 4 lines in your changes missing coverage. Please review.

Project coverage is 66.59%. Comparing base (df5db3b) to head (d063d25).

Additional details and impacted files
@@             Coverage Diff              @@
##           release-1.6     #670   +/-   ##
============================================
  Coverage        66.58%   66.59%           
============================================
  Files               70       70           
  Lines             8108     8110    +2     
============================================
+ Hits              5399     5401    +2     
  Misses            2315     2315           
  Partials           394      394           
Flag Coverage Δ
unittests 66.59% <66.66%> (+<0.01%) ⬆️

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

Files Coverage Δ
controllers/consoleplugin/consoleplugin_objects.go 87.25% <71.42%> (+0.03%) ⬆️
...trollers/consoleplugin/consoleplugin_reconciler.go 71.42% <60.00%> (+0.21%) ⬆️

@memodi
Copy link
Contributor

memodi commented Jun 5, 2024

/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 Jun 5, 2024
Copy link

github-actions bot commented Jun 5, 2024

New images:

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

They will expire after two weeks.

To deploy this build:

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

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

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

@memodi
Copy link
Contributor

memodi commented Jun 5, 2024

this fixes it, thanks!

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved QE has approved this pull request label Jun 5, 2024
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Jun 5, 2024

@jotak: This pull request references NETOBSERV-1647 which is a valid jira issue.

In response to this:

cf #669

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 openshift-eng/jira-lifecycle-plugin repository.

Note we're talking here about versions of ConversionReview (ie.
apiextension), NOT versions of our CRDs

- Use same versions for flowcollector and flowmetrics
- Use just v1 as the only other (v1beta1) was dropped a while ago (kube
  1.22 / 2021)
@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 Jun 6, 2024
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Jun 6, 2024

@jotak: This pull request references NETOBSERV-1647 which is a valid jira issue.

In response to this:

cf #669

also includes backport of #662 to fix flaky CI

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

openshift-ci bot commented Jun 6, 2024

[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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 8c0c1eb into netobserv:release-1.6 Jun 6, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants