Fix strongSwan configuration file with strongSwan >= version 5.7.0 #1191

jianjuns · 2020-09-01T05:09:50Z

Starting from version 5.7.0, strongSwan no more supports to specify a
configuration paramter with the path delimited by dots in a
configuration file. This change breaks ovs-ipsec-monitor which writes
strongSwan configuration parameters with the dotted paths.
This commit applies an ovs-monitor-ipsec patch to fix the issue, as a
workaround before the patch is merged to OVS upstream.

antrea-bot · 2020-09-01T05:10:01Z

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

/test-e2e: to trigger e2e tests.
/skip-e2e: to skip e2e tests.
/test-conformance: to trigger conformance tests.
/skip-conformance: to skip conformance tests.
/test-whole-conformance: to trigger all conformance tests on linux.
/skip-whole-conformance: to skip all conformance tests on linux.
/test-networkpolicy: to trigger networkpolicy tests.
/skip-networkpolicy: to skip networkpolicy tests.
/test-windows-conformance: to trigger windows conformance tests.
/skip-windows-conformance: to skip windows conformance tests.
/test-windows-networkpolicy: to trigger windows networkpolicy tests.
/skip-windows-networkpolicy: to skip windows networkpolicy tests.
/test-hw-offload: to trigger ovs hardware offload test.
/skip-hw-offload: to skip ovs hardware offload test.
/test-all: to trigger all tests (except whole conformance).
/skip-all: to skip all tests (except whole conformance).

codecov-commenter · 2020-09-01T05:14:31Z

Codecov Report

Merging #1191 into master will increase coverage by 14.69%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #1191       +/-   ##
===========================================
+ Coverage   41.60%   56.30%   +14.69%     
===========================================
  Files          74      105       +31     
  Lines       10508    11529     +1021     
===========================================
+ Hits         4372     6491     +2119     
+ Misses       5780     4469     -1311     
- Partials      356      569      +213

Flag	Coverage Δ
#integration-tests	`47.53% <ø> (?)`
#unit-tests	`41.63% <ø> (+0.02%)`	⬆️

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

Impacted Files	Coverage Δ
pkg/k8s/name.go	`50.00% <0.00%> (ø)`
pkg/agent/interfacestore/types.go	`52.00% <0.00%> (ø)`
pkg/agent/cniserver/ipam/ipam_delegator.go	`2.00% <0.00%> (ø)`
pkg/agent/proxy/types/groupcounter.go	`0.00% <0.00%> (ø)`
pkg/agent/metrics/prometheus.go	`39.53% <0.00%> (ø)`
pkg/querier/querier.go	`0.00% <0.00%> (ø)`
pkg/features/antrea_features.go	`100.00% <0.00%> (ø)`
pkg/apis/system/v1beta1/register.go	`84.61% <0.00%> (ø)`
pkg/ovs/ovsctl/interface.go	`0.00% <0.00%> (ø)`
pkg/agent/util/ethtool/ethtool_linux.go	`0.00% <0.00%> (ø)`
... and 46 more

tnqn · 2020-09-01T05:29:30Z

build/images/ovs/apply-patches.sh

@@ -80,8 +80,16 @@ if version_get "$OVS_VERSION" "2.13.0" && version_lt "$OVS_VERSION" "2.14.0" ; t
        git apply
 fi

+# Starting from version 5.7.0, strongSwan no more supports to specify a configuration parameter with
+# the path delimited by dots in a configuration file. This patch fixes the strongSwan confiugration


Suggested change

# the path delimited by dots in a configuration file. This patch fixes the strongSwan confiugration

# the path delimited by dots in a configuration file. This patch fixes the strongSwan configuration

Fixed. Thanks!

tnqn

LGTM

antoninbas · 2020-09-01T18:26:20Z

build/images/ovs/apply-patches.sh

@@ -80,8 +80,16 @@ if version_get "$OVS_VERSION" "2.13.0" && version_lt "$OVS_VERSION" "2.14.0" ; t
        git apply
 fi

+# Starting from version 5.7.0, strongSwan no more supports to specify a configuration parameter with


s/strongSwan no more supports to specify a configuration/strongSwan no longer supports specifying a configuration

antoninbas · 2020-09-01T18:27:55Z

build/images/ovs/apply-patches.sh

+# After the patch is merged into OVS upstream, we should remove this workaround to apply the patch
+# here.


The first step will be to change the URL for the patch actually, so:

After the patch is merged into OVS upstream, we should change the URL to an upstream one.

We won't be able to remove this altogether until there is a new OVS release with the patch.

Revised the comments. Check.

Starting from version 5.7.0, strongSwan no longer supports specifying a configuration parameter with the path delimited by dots in a configuration file. This change breaks ovs-ipsec-monitor which writes strongSwan configuration parameters with the dotted paths. This commit applies an ovs-monitor-ipsec patch to fix the issue, as a workaround before the patch is merged to OVS upstream.

antoninbas

LGTM

antoninbas · 2020-09-02T05:28:22Z

/test-all

jianjuns · 2020-09-02T05:50:56Z

/test-networkpolicy

…ntrea-io#1191) Starting from version 5.7.0, strongSwan no longer supports specifying a configuration parameter with the path delimited by dots in a configuration file. This change breaks ovs-ipsec-monitor which writes strongSwan configuration parameters with the dotted paths. This commit applies an ovs-monitor-ipsec patch to fix the issue, as a workaround before the patch is merged to OVS upstream.

…1191) Starting from version 5.7.0, strongSwan no longer supports specifying a configuration parameter with the path delimited by dots in a configuration file. This change breaks ovs-ipsec-monitor which writes strongSwan configuration parameters with the dotted paths. This commit applies an ovs-monitor-ipsec patch to fix the issue, as a workaround before the patch is merged to OVS upstream.

…ntrea-io#1191) Starting from version 5.7.0, strongSwan no longer supports specifying a configuration parameter with the path delimited by dots in a configuration file. This change breaks ovs-ipsec-monitor which writes strongSwan configuration parameters with the dotted paths. This commit applies an ovs-monitor-ipsec patch to fix the issue, as a workaround before the patch is merged to OVS upstream.

jianjuns requested review from antoninbas and lzhecheng September 1, 2020 05:09

vmwclabot added the cla-not-required label Sep 1, 2020

jianjuns force-pushed the ipsec-config branch from c6d3682 to 7aca18d Compare September 1, 2020 05:25

tnqn reviewed Sep 1, 2020

View reviewed changes

jianjuns force-pushed the ipsec-config branch from 7aca18d to e601e44 Compare September 1, 2020 05:47

tnqn previously approved these changes Sep 1, 2020

View reviewed changes

jianjuns mentioned this pull request Sep 1, 2020

Fix strongSwan logging configuration #1184

Merged

antoninbas reviewed Sep 1, 2020

View reviewed changes

jianjuns dismissed tnqn’s stale review via 1d8100d September 1, 2020 19:21

jianjuns force-pushed the ipsec-config branch 3 times, most recently from bbdb99c to 7571e5a Compare September 1, 2020 20:27

jianjuns force-pushed the ipsec-config branch from 7571e5a to ec5242f Compare September 2, 2020 05:21

antoninbas approved these changes Sep 2, 2020

View reviewed changes

tnqn approved these changes Sep 2, 2020

View reviewed changes

tnqn merged commit 2ec50c0 into antrea-io:master Sep 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix strongSwan configuration file with strongSwan >= version 5.7.0 #1191

Fix strongSwan configuration file with strongSwan >= version 5.7.0 #1191

jianjuns commented Sep 1, 2020

antrea-bot commented Sep 1, 2020

codecov-commenter commented Sep 1, 2020 •

edited

tnqn Sep 1, 2020

jianjuns Sep 1, 2020

tnqn left a comment

antoninbas Sep 1, 2020

jianjuns Sep 1, 2020

antoninbas Sep 1, 2020

jianjuns Sep 1, 2020

antoninbas left a comment

antoninbas commented Sep 2, 2020

jianjuns commented Sep 2, 2020

	# the path delimited by dots in a configuration file. This patch fixes the strongSwan confiugration
	# the path delimited by dots in a configuration file. This patch fixes the strongSwan configuration

		# After the patch is merged into OVS upstream, we should remove this workaround to apply the patch
		# here.

Fix strongSwan configuration file with strongSwan >= version 5.7.0 #1191

Fix strongSwan configuration file with strongSwan >= version 5.7.0 #1191

Conversation

jianjuns commented Sep 1, 2020

antrea-bot commented Sep 1, 2020

codecov-commenter commented Sep 1, 2020 • edited

Codecov Report

tnqn Sep 1, 2020

Choose a reason for hiding this comment

jianjuns Sep 1, 2020

Choose a reason for hiding this comment

tnqn left a comment

Choose a reason for hiding this comment

antoninbas Sep 1, 2020

Choose a reason for hiding this comment

jianjuns Sep 1, 2020

Choose a reason for hiding this comment

antoninbas Sep 1, 2020

Choose a reason for hiding this comment

jianjuns Sep 1, 2020

Choose a reason for hiding this comment

antoninbas left a comment

Choose a reason for hiding this comment

antoninbas commented Sep 2, 2020

jianjuns commented Sep 2, 2020

codecov-commenter commented Sep 1, 2020 •

edited