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 Windows OVS Containerisation in Install-OVS script #5055

Closed
wants to merge 1 commit into from

Conversation

NamanAg30
Copy link
Contributor

For #4952

docs/windows.md Outdated Show resolved Hide resolved
@NamanAg30 NamanAg30 marked this pull request as ready for review June 1, 2023 11:15
docs/windows.md Outdated Show resolved Hide resolved
docs/windows.md Outdated Show resolved Hide resolved
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.

I am a bit confused on the parameter "ContaineriseOVS", it looks when the flag is set as $true, no usespace processes is installed. Instead, when it is set as "$false", the OVS usespace service are installed. If this is your idea, I would prefer to modify this parameter with something like "InstallUserspace", and the default value is $true. The steps to install OVS userspace processes are ignored only when its value is set as $false.

docs/windows.md Outdated Show resolved Hide resolved
docs/windows.md Outdated Show resolved Hide resolved
docs/windows.md Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
@NamanAg30
Copy link
Contributor Author

I am a bit confused on the parameter "ContaineriseOVS", it looks when the flag is set as $true, no usespace processes is installed. Instead, when it is set as "$false", the OVS usespace service are installed. If this is your idea, I would prefer to modify this parameter with something like "InstallUserspace", and the default value is $true. The steps to install OVS userspace processes are ignored only when its value is set as $false.

I used the parameter name containeriseOVS so that user can decide whether they want to run ovs processes inside Container or on the host , hence the default value is false.When true it does not install the processes and user can then apply the updated antrea-windows-containerd.yaml to run these processes inside the container.I have updated relevant information in the windows.md doc file and in the comments section in Install OVS script.

@wenyingd
Copy link
Contributor

wenyingd commented Jun 5, 2023

I used the parameter name containeriseOVS so that user can decide whether they want to run ovs processes inside Container or on the host , hence the default value is false.When true it does not install the processes and user can then apply the updated antrea-windows-containerd.yaml to run these processes inside the container.I have updated relevant information in the windows.md doc file and in the comments section in Install OVS script.

I got your idea, but my point is a parameter should always tell what to do but not "what not to do". The parameter "ContaineriseOVS" is telling the script not to install OVS Services. That is strange. So I suggested to use paramter to tell the script to install service with a default value $true.

@NamanAg30
Copy link
Contributor Author

I got your idea, but my point is a parameter should always tell what to do but not "what not to do". The parameter "ContaineriseOVS" is telling the script not to install OVS Services. That is strange. So I suggested to use paramter to tell the script to install service with a default value $true.

Okay I got your point. I have made the changes. Can you check whether anything else needs to be changed

@luolanzone luolanzone added the action/release-note Indicates a PR that should be included in release notes. label Jun 6, 2023
@luolanzone luolanzone added this to the Antrea v1.13 release milestone Jun 6, 2023
@luolanzone luolanzone added the area/OS/windows Issues or PRs related to the Windows operating system. label Jun 6, 2023
@luolanzone
Copy link
Contributor

@XinShuYang in last sync meeting, you mentioned that there are three PRs need to be merged into one to pass CI tests, could you point out the PR numbers? thanks.

@XinShuYang
Copy link
Contributor

@luolanzone
#5055
#5052
#4936
All these PRs are for the issue #4952
cc @rajnkamr

@XinShuYang
Copy link
Contributor

LGTM, but this PR should be combined with #5052 and #4936 before merging since the doc change involves ovs support in container, which is not supported by this single PR. cc @rajnkamr

docs/windows.md Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved
hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved
@NamanAg30 NamanAg30 force-pushed the ovsscript branch 4 times, most recently from 6050c6f to e48ca1f Compare June 9, 2023 05:28
@NamanAg30 NamanAg30 requested a review from wenyingd June 9, 2023 05:30
@NamanAg30
Copy link
Contributor Author

@wenyingd Anything else that needs to be changed in this patch?

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.

Overall LGTM, a minor comment is left

hack/windows/Install-OVS.ps1 Outdated Show resolved Hide resolved
For antrea-io#4952

Signed-off-by: Naman Agarwal <naman.agarwal75@gmail.com>

.PARAMETER InstallUserspace
Specifies whether OVS userspace processes are included in the installation. If false, these processes will not
be installed as Windows service on the host.
Copy link
Contributor

Choose a reason for hiding this comment

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

a Windows service

@@ -22,6 +22,10 @@ Install OVS
.PARAMETER NodeIP
The node ip used by kubelet

.PARAMETER InstallOVSUserspace
Specifies whether OVS userspace processes is included in the installation. If false, these processes will not
be installed as Windows service on the host.
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto

@@ -23,6 +23,7 @@ The following components should be configured and run on the Windows Node.

antrea-agent and kube-proxy run as processes on host and are managed by
management Pods. It is recommended to run OVS daemons as Windows services.
We also support running OVS processes inside container.
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you adjust lines to wrap at column 80?

@@ -302,6 +303,14 @@ get-service ovsdb-server
get-service ovs-vswitchd
```

If you want to containerise OVS for containerd runtime, OVS userspace processes is
Copy link
Contributor

Choose a reason for hiding this comment

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

"containerize" is used more?

Copy link
Contributor

Choose a reason for hiding this comment

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

is -> are

@@ -302,6 +303,14 @@ get-service ovsdb-server
get-service ovs-vswitchd
```

If you want to containerise OVS for containerd runtime, OVS userspace processes is
not required on host and hence you can use the `InstallUserspace` parameter
Copy link
Contributor

Choose a reason for hiding this comment

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

"not required" -> "not run"?

on the host

@@ -302,6 +303,14 @@ get-service ovsdb-server
get-service ovs-vswitchd
```

If you want to containerise OVS for containerd runtime, OVS userspace processes is
not required on host and hence you can use the `InstallUserspace` parameter
as false.
Copy link
Contributor

Choose a reason for hiding this comment

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

set the InstallUserspace parameter to false

@NamanAg30
Copy link
Contributor Author

NamanAg30 commented Jul 11, 2023

@jianjuns This PR ha been merged with the PR here and changes according to your comments have been made there itself.

@NamanAg30 NamanAg30 marked this pull request as draft July 11, 2023 05:41
@rajnkamr rajnkamr removed area/OS/windows Issues or PRs related to the Windows operating system. action/release-note Indicates a PR that should be included in release notes. labels Jul 11, 2023
@rajnkamr rajnkamr removed this from the Antrea v1.13 release milestone Jul 11, 2023
@github-actions
Copy link
Contributor

This PR is stale because it has been open 90 days with no activity. Remove stale label or comment, or this will be closed in 90 days

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 10, 2023
@github-actions github-actions bot closed this Jan 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants