Align downstream dockerfile with the upstream one

[OlivierCazade]

Description

This fix the multiarch build with konflux.

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

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 27.61%. Comparing base (933a294) to head (c798bf6).
Report is 1 commits behind head on release-1.8.

Additional details and impacted files

@@               Coverage Diff               @@
##           release-1.8     #557      +/-   ##
===============================================
+ Coverage        27.48%   27.61%   +0.12%     
===============================================
  Files               46       46              
  Lines             4940     4940              
===============================================
+ Hits              1358     1364       +6     
+ Misses            3478     3473       -5     
+ Partials           104      103       -1     

Flag	Coverage Δ
unittests	27.61% <ø> (+0.12%)	⬆️

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

see 2 files with indirect coverage changes

[msherif1234]

don't u need --platform=linux/$TARGETARCH here as well ?

[OlivierCazade]

I added it, thanks!

[jotak]

I wonder if you don't also need to add ARG COMMIT here, and also, move the one line 8 to the next layer after line 24
I'm comparing this file with https://github.com/netobserv/flowlogs-pipeline/blob/main/contrib/docker/Dockerfile.downstream

[OlivierCazade]

I also added it, thanks!

[jpinsonneau]

Suggested change

	ARG TARGETARCH
	ARG TARGETARCH
	ARG COMMIT

Shouldn't it be on the top ? 🤔

[OlivierCazade]

Done! Thanks

[msherif1234]

hmm who set that argument I checked flp and operator they don't seem to use it ? does konflux pipeline set it ? I don't think so

[OlivierCazade]

The updstream Dockerfile for the ebpf agent is using one:

netobserv-ebpf-agent/Dockerfile

Line 7 in cee90d9

ARG LDFLAGS

This is to align with it.

[msherif1234]

but its set in the Makefile I am not sure if konflux pipeline will set tbh ? pls check konflux build log to see if its set

[msherif1234]

if its not set then we need to set like in https://github.com/netobserv/netobserv-ebpf-agent/blob/main/Makefile#L29

[jotak]

If you don't mind to fix FIPS at the same time :-)

Suggested change

	RUN GOARCH=$TARGETARCH go build -ldflags "$LDFLAGS" -mod vendor -a -o bin/netobserv-ebpf-agent cmd/netobserv-ebpf-agent.go
	ENV GOEXPERIMENT strictfipsruntime
	RUN GOARCH=$TARGETARCH go build -tags strictfipsruntime -ldflags "$LDFLAGS" -mod vendor -a -o bin/netobserv-ebpf-agent cmd/netobserv-ebpf-agent.go

[msherif1234]

/lgtm

[OlivierCazade]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: OlivierCazade

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 [OlivierCazade]

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