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

Fix base-windows Dockerfile and script #4369

Merged
merged 1 commit into from
Nov 7, 2022

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Nov 3, 2022

CNI_BINARIES_VERSION is missing when building windows-golang and base-windows images, leading to CNI binaries missing in the target image. The issue was not discovered because the curl command used in the Dockerfile ignored HTTP 404 code and didn't fail the build.

The patch adds the missing argument and makes curl command fail on HTTP errors.

Signed-off-by: Quan Tian [email protected]

@codecov
Copy link

codecov bot commented Nov 3, 2022

Codecov Report

Merging #4369 (6e6cc34) into main (85e144c) will increase coverage by 1.22%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4369      +/-   ##
==========================================
+ Coverage   63.34%   64.56%   +1.22%     
==========================================
  Files         397      397              
  Lines       56204    56204              
==========================================
+ Hits        35601    36287     +686     
+ Misses      18011    17277     -734     
- Partials     2592     2640      +48     
Flag Coverage Δ
integration-tests 34.54% <ø> (+0.02%) ⬆️
kind-e2e-tests 48.45% <ø> (+2.51%) ⬆️
unit-tests 48.47% <ø> (-0.04%) ⬇️
Impacted Files Coverage Δ
pkg/controller/networkpolicy/store/addressgroup.go 88.37% <0.00%> (-3.49%) ⬇️
pkg/agent/memberlist/cluster.go 72.29% <0.00%> (-2.87%) ⬇️
...gent/controller/noderoute/node_route_controller.go 57.43% <0.00%> (-1.86%) ⬇️
...g/agent/cniserver/interface_configuration_linux.go 26.45% <0.00%> (-0.98%) ⬇️
pkg/ipam/poolallocator/allocator.go 74.04% <0.00%> (-0.96%) ⬇️
pkg/ovs/openflow/ofctrl_bridge.go 77.21% <0.00%> (-0.57%) ⬇️
pkg/agent/controller/networkpolicy/reject.go 75.86% <0.00%> (-0.50%) ⬇️
pkg/agent/proxy/proxier.go 69.90% <0.00%> (+0.15%) ⬆️
pkg/agent/route/route_linux.go 71.65% <0.00%> (+0.16%) ⬆️
pkg/agent/openflow/pipeline.go 84.63% <0.00%> (+0.33%) ⬆️
... and 37 more

@tnqn tnqn changed the title Fix cache miss caused by unset CNI_BINARIES_VERSION Fix base-windows Dockerfile and script Nov 3, 2022
CNI_BINARIES_VERSION is missing when building windows-golang and
antrea/base-windows images, leading to CNI binaries missing in the
target image. The issue was not discovered because the curl command
used in the Dockerfile ignored HTTP 404 code and didn't fail the
build.

The patch adds the missing argument and makes curl command fail on
HTTP errors.

Signed-off-by: Quan Tian <[email protected]>
Copy link
Contributor

@XinShuYang XinShuYang left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks for fixing it.

@tnqn tnqn closed this Nov 4, 2022
@tnqn tnqn reopened this Nov 4, 2022
@tnqn tnqn requested a review from antoninbas November 4, 2022 10:42
@tnqn
Copy link
Member Author

tnqn commented Nov 7, 2022

/skip-all

@tnqn tnqn merged commit 16fde23 into antrea-io:main Nov 7, 2022
@tnqn tnqn deleted the fix-base-windows-build branch November 7, 2022 04:29
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Jan 27, 2023
CNI_BINARIES_VERSION is missing when building windows-golang and
antrea/base-windows images, leading to CNI binaries missing in the
target image. The issue was not discovered because the curl command
used in the Dockerfile ignored HTTP 404 code and didn't fail the
build.

The patch adds the missing argument and makes curl command fail on
HTTP errors.

Signed-off-by: Quan Tian <[email protected]>
heanlan pushed a commit to heanlan/antrea that referenced this pull request Mar 29, 2023
CNI_BINARIES_VERSION is missing when building windows-golang and
antrea/base-windows images, leading to CNI binaries missing in the
target image. The issue was not discovered because the curl command
used in the Dockerfile ignored HTTP 404 code and didn't fail the
build.

The patch adds the missing argument and makes curl command fail on
HTTP errors.

Signed-off-by: Quan Tian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants