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

Add support for IPsec to UBI based image #4244

Merged
merged 1 commit into from
Sep 22, 2022

Conversation

xliuxu
Copy link
Contributor

@xliuxu xliuxu commented Sep 21, 2022

  1. Do not install strongswan in UBI-based image.
  2. Add support for libreswan to start_ovs_ipsec start script.

Fixes: #4243

Signed-off-by: Xu Liu [email protected]

@codecov
Copy link

codecov bot commented Sep 21, 2022

Codecov Report

Merging #4244 (1a1727d) into main (4caa8c1) will decrease coverage by 4.25%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4244      +/-   ##
==========================================
- Coverage   64.29%   60.03%   -4.26%     
==========================================
  Files         361      375      +14     
  Lines       52203    53990    +1787     
==========================================
- Hits        33563    32414    -1149     
- Misses      16186    19148    +2962     
+ Partials     2454     2428      -26     
Flag Coverage Δ
integration-tests 34.96% <ø> (+0.13%) ⬆️
kind-e2e-tests 47.88% <ø> (-0.69%) ⬇️
unit-tests 43.18% <ø> (-1.84%) ⬇️
Impacted Files Coverage Δ
pkg/cni/client.go 0.00% <0.00%> (-77.78%) ⬇️
...rs/multicluster/commonarea/clusterinfo_importer.go 0.00% <0.00%> (-74.51%) ⬇️
...kg/agent/flowexporter/connections/conntrack_ovs.go 0.00% <0.00%> (-70.91%) ⬇️
...uster/commonarea/acnp_resourceimport_controller.go 0.00% <0.00%> (-69.83%) ⬇️
...luster/controllers/multicluster/node_controller.go 0.00% <0.00%> (-68.79%) ⬇️
...s/multicluster/memberclusterannounce_controller.go 0.00% <0.00%> (-67.75%) ⬇️
...trollers/multicluster/clusterinfoexport_handler.go 0.00% <0.00%> (-67.40%) ⬇️
...ter/controllers/multicluster/gateway_controller.go 1.50% <0.00%> (-60.91%) ⬇️
...llers/multicluster/leader_clusterset_controller.go 0.00% <0.00%> (-55.66%) ⬇️
...uster/controllers/multicluster/controller_utils.go 18.88% <0.00%> (-51.12%) ⬇️
... and 89 more

antoninbas
antoninbas previously approved these changes Sep 21, 2022
mv /etc/logrotate.d/openvswitch /etc/logrotate.d/openvswitch-switch && \
sed -i "/rotate /a\ #size 100M" /etc/logrotate.d/openvswitch-switch && \
sed -i 's/^initsystem=.*$/initsystem="namespaces"/' /usr/libexec/ipsec/setup && \
Copy link
Contributor

Choose a reason for hiding this comment

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

what's this for? can we add a comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added. Thanks!

ksamoray
ksamoray previously approved these changes Sep 22, 2022
Copy link
Contributor

@ksamoray ksamoray left a comment

Choose a reason for hiding this comment

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

LGTM

@xliuxu xliuxu changed the title Add support for IPsec in UBI based image Add support for IPsec to UBI based image Sep 22, 2022
1. Do not install strongswan in UBI-based image.
2. Add support for libreswan to `start_ovs_ipsec` start script.

Fixes: antrea-io#4243

Signed-off-by: Xu Liu <[email protected]>
@antoninbas
Copy link
Contributor

/skip-all

@antoninbas antoninbas merged commit 68a5fe6 into antrea-io:main Sep 22, 2022
@xliuxu xliuxu deleted the ipsec_ubi_image branch September 23, 2022 02:13
qiyueyao pushed a commit to qiyueyao/antrea that referenced this pull request Nov 2, 2022
1. Do not install strongswan in UBI-based image.
2. Add support for libreswan to `start_ovs_ipsec` start script.

Fixes: antrea-io#4243

Signed-off-by: Xu Liu <[email protected]>
qiyueyao pushed a commit to qiyueyao/antrea that referenced this pull request Nov 2, 2022
1. Do not install strongswan in UBI-based image.
2. Add support for libreswan to `start_ovs_ipsec` start script.

Fixes: antrea-io#4243

Signed-off-by: Xu Liu <[email protected]>
heanlan pushed a commit to heanlan/antrea that referenced this pull request Mar 29, 2023
1. Do not install strongswan in UBI-based image.
2. Add support for libreswan to `start_ovs_ipsec` start script.

Fixes: antrea-io#4243

Signed-off-by: Xu Liu <[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.

IPsec not working in UBI based image
3 participants