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

[Windows] Check if importing certificate is needed #1963

Merged
merged 1 commit into from
Mar 25, 2021

Conversation

lzhecheng
Copy link
Contributor

  • Added a new option "ImportCertificate" to decide if certificate is needed.
    Default is true
  • Simplified certificate addition with command "Import-Certificate"

Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

Do the installation instructions in https://github.com/vmware-tanzu/antrea/blob/main/docs/windows.md need to be updated?

hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Mar 18, 2021

Codecov Report

Merging #1963 (8480199) into main (e80ab3b) will decrease coverage by 4.65%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1963      +/-   ##
==========================================
- Coverage   64.35%   59.69%   -4.66%     
==========================================
  Files         193      197       +4     
  Lines       16967    17217     +250     
==========================================
- Hits        10919    10278     -641     
- Misses       4899     5837     +938     
+ Partials     1149     1102      -47     
Flag Coverage Δ
kind-e2e-tests 45.39% <ø> (-9.82%) ⬇️
unit-tests 41.89% <ø> (+0.24%) ⬆️

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

Impacted Files Coverage Δ
pkg/apis/controlplane/helper.go 25.00% <0.00%> (-75.00%) ⬇️
pkg/apis/controlplane/v1beta2/helper.go 25.00% <0.00%> (-75.00%) ⬇️
pkg/controller/networkpolicy/mutate.go 0.00% <0.00%> (-71.77%) ⬇️
pkg/controller/networkpolicy/validate.go 0.00% <0.00%> (-71.57%) ⬇️
pkg/k8s/name.go 33.33% <0.00%> (-66.67%) ⬇️
pkg/controller/networkpolicy/store/group.go 6.66% <0.00%> (-65.34%) ⬇️
pkg/agent/controller/networkpolicy/packetin.go 9.09% <0.00%> (-57.07%) ⬇️
pkg/apiserver/handlers/webhook/mutation_crd.go 0.00% <0.00%> (-52.64%) ⬇️
pkg/apiserver/handlers/webhook/validation_crd.go 0.00% <0.00%> (-52.64%) ⬇️
pkg/controller/networkpolicy/tier.go 0.00% <0.00%> (-52.50%) ⬇️
... and 46 more

@lzhecheng lzhecheng requested a review from antoninbas March 18, 2021 06:00
docs/windows.md Outdated
script to install the OVS driver and register userspace binaries as services.
script `Install-OVS.ps1` to install the OVS driver and register userspace binaries
as services. You can set `-ImportCertificate` option of `Install-OVS.ps1` to $false
if you have a signed OVS package.
Copy link
Contributor

Choose a reason for hiding this comment

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

if you have a signed OVS package.

does that imply signed by a valid certificated authority? Does it make sense to provide -ImportCertificate $false, and still enable test-signing mode as described below?

Maybe we should separate this information into 2 different sections. "Test-only installation" and "Production installation" (for folks with their own signed OVS package).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed.
I didn't separate into 2 sections since they share many. But I still mentioned the difference (test-only and production) and I think it is enough for users to distinguish. PTAL.

Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

some nits, I think it is better now

docs/windows.md Outdated Show resolved Hide resolved
docs/windows.md Outdated
script to install the OVS driver and register userspace binaries as services.
script `Install-OVS.ps1` to install the OVS driver and register userspace binaries
as services. If you want to use your own signed OVS package for production, you can
run `Install-OVS.ps1` like this: `Install-OVS.ps1 -ImportCertificate $false -Local -LocalFile <PathToOVSPackage>`
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: for the full command use a code block with a powershell code specifier

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.

docs/windows.md Outdated Show resolved Hide resolved
docs/windows.md Outdated Show resolved Hide resolved
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

LGTM.

antoninbas
antoninbas previously approved these changes Mar 23, 2021
@lzhecheng
Copy link
Contributor Author

This change includes a doc and install-ovs script. The script is verified by job "jenkins-windows-ovs" and the build is successful.
/skip-all

@lzhecheng
Copy link
Contributor Author

@antoninbas could you please approve again? I didn't realize there was a "docs and spelling" mistake that "Fenced code blocks should be surrounded by blank lines"

/skip-all

@lzhecheng lzhecheng requested a review from antoninbas March 23, 2021 06:40
@tnqn
Copy link
Member

tnqn commented Mar 23, 2021

"s/check If importing/check if importing" in PR title
"s/if importing certificate is needed/check if importing certificate is needed" in commit message title

* Added a new option "ImportCertificate" to decide if certificate is needed.
  Default is true
* Simplified certificate addition with command "Import-Certificate"
@lzhecheng lzhecheng changed the title [Windows] check If importing certificate is needed [Windows] Check if importing certificate is needed Mar 23, 2021
@lzhecheng
Copy link
Contributor Author

"s/check If importing/check if importing" in PR title
"s/if importing certificate is needed/check if importing certificate is needed" in commit message title

Updated. /skip-all

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

@lzhecheng lzhecheng merged commit 9b8440d into antrea-io:main Mar 25, 2021
@lzhecheng lzhecheng deleted the win-install-ovs branch March 25, 2021 00:40
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Mar 26, 2021
* Added a new option "ImportCertificate" to decide if certificate is needed.
  Default is true
* Simplified certificate addition with command "Import-Certificate"
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.

6 participants