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.

Sign up for GitHub

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

Jump to bottom

NETOBSERV-1633 Konflux pipeline multiarch and downstream requirements #738

Merged
merged 3 commits into from
Oct 18, 2024
Merged

NETOBSERV-1633 Konflux pipeline multiarch and downstream requirements #738

merged 3 commits into from
Oct 18, 2024

Conversation

OlivierCazade
Copy link
Contributor

@OlivierCazade OlivierCazade commented Oct 14, 2024 •
edited
Loading

Description

  • pipeline refactoring to only have one pipeline definition
  • adding a dedicated downstream Dockerfile
  • adding multi arch build support

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.

  • Will this change affect NetObserv / Network Observability operator? If not, you can ignore the rest of this checklist.
  • 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).

@OlivierCazade
Copy link
Contributor Author

/hold

PR not ready but need to run konflux to test

@codecov Codecov
Copy link

codecov bot commented Oct 14, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.37%. Comparing base (e179f45) to head (85b5f3a).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #738      +/-   ##
==========================================
- Coverage   65.47%   64.37%   -1.10%     
==========================================
  Files         108      108              
  Lines        7026     8303    +1277     
==========================================
+ Hits         4600     5345     +745     
- Misses       2108     2639     +531     
- Partials      318      319       +1
Flag Coverage Δ
unittests 64.37% <ø> (-1.10%) ⬇️

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

see 102 files with indirect coverage changes

@OlivierCazade OlivierCazade force-pushed the konflux-multiarch branch 10 times, most recently from c8b163f to 53bbeeb Compare October 16, 2024 14:08
jotak
jotak reviewed Oct 17, 2024
View reviewed changes
contrib/docker/Dockerfile.downstream Outdated
FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.4

COPY --from=builder /app/flowlogs-pipeline /app/
COPY --from=builder /app/confgenerator /app/
Copy link
Member

Choose a reason for hiding this comment

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

iirc in cpaas midstream we did not include the confgenerator, it was only used in the upstream image

jotak
jotak reviewed Oct 17, 2024
View reviewed changes
contrib/docker/Dockerfile.downstream Outdated
COPY --from=builder /app/confgenerator /app/

# expose ports
EXPOSE 2055
Copy link
Member

Choose a reason for hiding this comment

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

i'd also remove the expose in the downstream, that's a legacy thing for ipfix/netflows

jotak
jotak reviewed Oct 17, 2024
View reviewed changes
contrib/docker/Dockerfile.downstream
@@ -1,22 +1,40 @@
#!/usr/bin/env bash
ARG TARGETARCH
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 as builder
Copy link
Member

Choose a reason for hiding this comment

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

is that going to be automatically tracked and updated by konflux bot?
currently in midstream we're on go 1.22.7

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes konflux will automatically upgrade it.

jpinsonneau
jpinsonneau reviewed Oct 17, 2024
View reviewed changes
contrib/docker/Dockerfile.downstream
LABEL com.redhat.component="network-observability-flowlogs-pipeline-container"
LABEL name="network-observability-flowlogs-pipeline"
LABEL io.k8s.display-name="Network Observability Flow-Logs Pipeline"
LABEL io.k8s.description="Network Observability Flow-Logs Pipeline"
LABEL summary="Network Observability Flow-Logs Pipeline"
LABEL maintainer="[email protected]"
LABEL io.openshift.tags="network-observability-flowlogs-pipeline"
LABEL upstream-vcs-ref="${COMMIT}"
LABEL upstream-vcs-type="git"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
LABEL upstream-vcs-type="git"

if you remove upstream-vcs-ref we should remove both

jotak
jotak reviewed Oct 17, 2024
View reviewed changes
.tekton/pipeline-ref.yaml Outdated
description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
name: build-args-file
type: string
- default: ["linux/x86_64", "linux/arm64"]
Copy link
Member

Choose a reason for hiding this comment

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

ibm power/z are not available?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@OlivierCazade OlivierCazade force-pushed the konflux-multiarch branch 2 times, most recently from 82180ac to 0780994 Compare October 17, 2024 10:01
jotak
jotak approved these changes Oct 17, 2024
View reviewed changes
Copy link
Member

@jotak jotak left a comment

Choose a reason for hiding this comment

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

LGTM
with 2 small suggestions to make it more similar to what we have in cpaas, but no blocker

@openshift-ci openshift-ci bot added the lgtm label Oct 17, 2024
@openshift-ci openshift-ci bot removed the lgtm label Oct 17, 2024
@jotak
Copy link
Member

jotak commented Oct 17, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 17, 2024
@openshift-ci openshift-ci bot removed the lgtm label Oct 18, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 18, 2024

New changes are detected. LGTM label has been removed.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 18, 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 753c34a into netobserv:main Oct 18, 2024
11 checks passed
OlivierCazade added a commit to OlivierCazade/flowlogs-pipeline that referenced this pull request Oct 18, 2024
@OlivierCazade
NETOBSERV-1633 Konflux pipeline multiarch and downstream requirements (…
5783eb9 
…netobserv#738)

* Konflux pipeline refactoring

* Added downstream Dockerfile

* Adding multi arch build to pipeline
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpinsonneau jpinsonneau jpinsonneau left review comments

@jotak jotak jotak approved these changes

Assignees

@jotak jotak

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OlivierCazade @jotak @jpinsonneau