-
Notifications
You must be signed in to change notification settings - Fork 359
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] Finish removing Docker and userspace kube-proxy support #6255
[Windows] Finish removing Docker and userspace kube-proxy support #6255
Conversation
ec9be8e
to
27f0704
Compare
if ($InstallKubeProxy) { | ||
Write-Host "Running Antrea with kube-proxy is no longer supported, this parameter will be removed soon" | ||
$StartKubeletFileContent += [Environment]::NewLine + '& C:\k\Prepare-ServiceInterface.ps1 -InterfaceAlias "HNS Internal NIC"' + [Environment]::NewLine |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line? I think we can just print the error message for InstallKubeProxy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted to wait for a couple more releases before removing kube-proxy support from the scripts completely (see PR description). Do you think we should just remove them now?
I personally think that would be acceptable, let's see if anyone else has an opinion on that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wenyingd @luolanzone let me know what you think
We can either keep the current version, or drop KubeProxy support completely from the scripts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both works for me, if it's removed from K8s 1.26, I guess it should be safe to remove as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep it as is since there is no real drawback and we are close to the release date. I will remove it post v2 and we can have the change in v2.1. Sounds acceptable?
docs/windows.md
Outdated
scripts which help to install and run these two components directly without Pod. | ||
Please see [Manually run kube-proxy and antrea-agent on Windows worker Nodes](#manually-run-kube-proxy-and-antrea-agent-on-windows-worker-nodes) | ||
section for details. | ||
antrea-agent and the OVS daemons can either run as Pods or as Windows services. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe some more clarification here ? If antrea-agent is running as service, OVS daemons also need to be run as service ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, I added a table which hopefully is useful
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One minor comments, others LGTM
docs/windows.md
Outdated
``` | ||
|
||
```powershell | ||
$TAG="v1.14.0" | ||
$TAG="v1.15.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$TAG="v1.15.0" | |
$TAG="v1.15.1" |
Use 1.15.1 to be consistent?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I updated everything to v2.0.0
We update the Windows documentation to remove all Docker-specific instructions, and all mentions of (userspace) kube-proxy. We also update Windows scripts to remove Docker support. The Prepare-AntreaAgent.ps1 script was still defaulting to installing kube-proxy, so we update the script to change this default behavior. For all the scripts, "omitting" kube-proxy is now the default behavior. The corresponding script parameters have not been removed yet, but they are not officially deprecated, and we can remove them in a future release, such as Antrea v2.3. Fixes antrea-io#5630 Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
7951d10
to
4e0e906
Compare
Now that containerd is the only supported container runtime, we rename antrea-windows-containerd.yml to antrea-windows.yml and antrea-windows-containerd-with-ovs.yml to antrea-windows-with-ovs.yml. Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
To preserve documentation acuracy, we remove some references to older Antrea versions. Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
4e0e906
to
fe6e1ac
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/test-windows-all |
We update the Windows documentation to remove all Docker-specific instructions, and all mentions of (userspace) kube-proxy.
We also update Windows scripts to remove Docker support. The Prepare-AntreaAgent.ps1 script was still defaulting to installing kube-proxy, so we update the script to change this default behavior. For all the scripts, "omitting" kube-proxy is now the default behavior. The corresponding script parameters have not been removed yet, but they are not officially deprecated, and we can remove them in a future release (maybe as early as v2.1).
Given that containerd is now the only supported container runtime on Windows, we rename antrea-windows-containerd.yml to antrea-windows.yml and antrea-windows-containerd-with-ovs.yml to antrea-windows-with-ovs.yml.
Fixes #5630