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 SSL checking function in windows OVS script #4029

Merged
merged 1 commit into from
Jul 22, 2022

Conversation

XinShuYang
Copy link
Contributor

@XinShuYang XinShuYang commented Jul 18, 2022

Windows OVS needs SSL files to start service.

Add new funtion in Install-OVS.ps1 to check files exist and install
SSL library if files don't exist.

Fixes #4027

Signed-off-by: Shuyang Xin gavinx@vmware.com
Co-authored-by: wenyingd wenyingd@vmware.com

@XinShuYang XinShuYang marked this pull request as ready for review July 18, 2022 16:15
@XinShuYang XinShuYang requested a review from wenyingd July 18, 2022 16:15
@codecov
Copy link

codecov bot commented Jul 18, 2022

Codecov Report

Merging #4029 (ec7a743) into main (0620323) will increase coverage by 3.60%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4029      +/-   ##
==========================================
+ Coverage   60.62%   64.22%   +3.60%     
==========================================
  Files         296      293       -3     
  Lines       43864    43686     -178     
==========================================
+ Hits        26592    28057    +1465     
+ Misses      15080    13348    -1732     
- Partials     2192     2281      +89     
Flag Coverage Δ
kind-e2e-tests 49.77% <ø> (+6.47%) ⬆️
unit-tests 44.20% <ø> (-0.09%) ⬇️
Impacted Files Coverage Δ
.../agent/flowexporter/priorityqueue/priorityqueue.go 65.55% <0.00%> (-27.78%) ⬇️
pkg/agent/flowexporter/exporter/exporter.go 67.82% <0.00%> (-10.15%) ⬇️
pkg/agent/controller/networkpolicy/reject.go 78.53% <0.00%> (-7.35%) ⬇️
pkg/controller/networkpolicy/status_controller.go 68.54% <0.00%> (-3.23%) ⬇️
pkg/controller/ipam/antrea_ipam_controller.go 75.10% <0.00%> (-1.32%) ⬇️
...r/ipseccertificate/ipsec_certificate_controller.go 62.54% <0.00%> (-0.98%) ⬇️
...s/multicluster/memberclusterannounce_controller.go 71.79% <0.00%> (ø)
...multicluster/commonarea/fake_remote_common_area.go
...trollers/multicluster/commonarea/leader_elector.go
...ticluster/commonarea/remote_common_area_manager.go
... and 66 more

}
}
$SSLZip = "openssl-1.0.2u-x64_86-win64.zip"
curl.exe -LO https://indy.fulgan.com/SSL/$SSLZip
Copy link
Contributor

Choose a reason for hiding this comment

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

Add check on the curl result before trying to unzip it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.

hack/windows/Install-OVS.ps1 Show resolved Hide resolved
@@ -199,6 +199,22 @@ function InstallOVS() {
SetEnvVar "Path" $env:Path
}

function CheckIfLibInstalled() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Rename it as "InstallDependency"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated

$SSLDownloadURL = "https://indy.fulgan.com/SSL/$SSLZip"
curl.exe -LO $SSLDownloadURL
If (!$?) {
Log "Download SSL files failed, URL: $SSLDownloadURL"
Copy link
Contributor

Choose a reason for hiding this comment

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

Add a reminder to let user manual install the dependent dll files, and we should list the exact name of the two dependent files.?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.

hack/windows/Install-OVS.ps1 Show resolved Hide resolved
@XinShuYang XinShuYang force-pushed the winssl branch 2 times, most recently from 0c74166 to 3bd5741 Compare July 22, 2022 02:04
wenyingd
wenyingd previously approved these changes Jul 22, 2022
Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

LGTM

@XinShuYang XinShuYang requested a review from tnqn July 22, 2022 05:05
@tnqn
Copy link
Member

tnqn commented Jul 22, 2022

s/issue #4027/Fixes #4027/ to autoclose the issue on merge.

Windows OVS needs SSL files to start service.

Add new funtion in Install-OVS.ps1 to check files exist and install
SSL library if files don't exist.

Fixes antrea-io#4027

Signed-off-by: Shuyang Xin <gavinx@vmware.com>
Co-authored-by: wenyingd <wenyingd@vmware.com>
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

hack/windows/Install-OVS.ps1 Show resolved Hide resolved
@tnqn
Copy link
Member

tnqn commented Jul 22, 2022

/skip-all
/test-windows-all

@tnqn tnqn merged commit d9c4629 into antrea-io:main Jul 22, 2022
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.

Install-OVS.ps1 failed to start ovsdb service without ssl files on windows
3 participants