Skip to content

Conversation

@davinci26
Copy link
Contributor

@davinci26 davinci26 commented Sep 14, 2021

Fixes #1002

Allow the cni plugin to marshall and apply L4WFPProxyPolicy
to Windows endpoints.

Tested on Kubernetes v1.19 with AKS-engine and docker runtime

Signed-off-by: Sotiris Nanopoulos sonanopo@microsoft.com

Reason for Change:

Issue Fixed:

Requirements:

Notes:

@davinci26
Copy link
Contributor Author

Some comments:

I see that the other policies do not have unit tests so I did not add any tests but I am happy to add tests as needed. Similar for the documentation.

I have verified this change with Kubernetes + docker, let me know if you want me to verify this with Kubernetes + containerd as well.

In general I am looking for your guidance and I am happy to do any validation/changes needed to get this PR merged

@rbtr
Copy link
Collaborator

rbtr commented Sep 14, 2021

first pass lgtm so I kicked off the CI
@davinci26 actually this week we are doing a quality week focused on unit tests, if you are up to UT this scenario that would be much appreciated 😊
k8s x containerd validation would be good. does this functionality deserve a full e2e scenario?

@rbtr
Copy link
Collaborator

rbtr commented Sep 14, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@davinci26
Copy link
Contributor Author

if you are up to UT this scenario that would be much appreciated

I can try to do that.

k8s x containerd validation would be good

I will validate that today

does this functionality deserve a full e2e scenario?

I dont think this is is needed as this is mostly a dev solution.

Is the errors in the CI due to my change?

@rbtr
Copy link
Collaborator

rbtr commented Sep 14, 2021

negative, it's a flaky test 👍🏼

@davinci26
Copy link
Contributor Author

davinci26 commented Sep 15, 2021

@rbtr as I was working through the containerd + kubernetes integration I realized that I need to update the version of github.com/Microsoft/hcsshim to v0.8.22 from v0.8.10 to pick up the api change.

Making this change is making the diff 300+ files where all the files are in the vendor path. Does this seem correct?

Also I have added unit tests but you won't be able to run them in CI because they require GOOS=windows go test -v ./network/policy to be invoked but I think you have a draft PR for that so they will become available

See #758

@rbtr
Copy link
Collaborator

rbtr commented Sep 15, 2021

hey @matmerr maybe you could bump your #961 to 0.8.22 and we can merge that before this?

@davinci26
Copy link
Contributor Author

Ok lets not merge this until #961 goes in (I still need to push my tests, I have them locally)

@matmerr
Copy link
Member

matmerr commented Sep 15, 2021

hey @matmerr maybe you could bump your #961 to 0.8.22 and we can merge that before this?

would like to have @ashvindeodhar's eyes on this as well as #961

@rbtr rbtr requested a review from ashvindeodhar September 15, 2021 21:51
ashvindeodhar
ashvindeodhar previously approved these changes Sep 16, 2021
Copy link
Member

@ashvindeodhar ashvindeodhar left a comment

Choose a reason for hiding this comment

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

lgtm

@davinci26 davinci26 mentioned this pull request Sep 16, 2021
3 tasks
Fixes Azure#1002

Allow the cni plugin to marshall and apply L4WFPProxyPolicy
to Windows endpoints.

Tested on Kubernetes v1.19 with AKS-engine and docker/containerd runtime

Signed-off-by: Sotiris Nanopoulos <sonanopo@microsoft.com>
@davinci26
Copy link
Contributor Author

Rebased and added a unit test for my feature as discussed. Please review if the test is in the correct direction, currently I invoke it with GOOS=windows go test -v ./network/policy but this mean that the test will not be invoked in the CI

@rbtr
Copy link
Collaborator

rbtr commented Sep 22, 2021

Thanks for updating 👍🏼
I am personally not a fan of ginkgo, but it is used for tests elsewhere in our repo already so 🤷🏼‍♂️

@ashvindeodhar can you re-review please?

@rbtr
Copy link
Collaborator

rbtr commented Sep 22, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@davinci26
Copy link
Contributor Author

@ashvindeodhar can you please take a look at this PR

@rbtr rbtr merged commit 4d27a9f into Azure:master Sep 27, 2021
@davinci26
Copy link
Contributor Author

Am I going to be too annoying if I also ask to carve out a release? I want to ingest this change into aks-engine

@rbtr
Copy link
Collaborator

rbtr commented Sep 29, 2021

You want a new Windows CNI release, right?

@davinci26
Copy link
Contributor Author

I want to push a pr similar to this https://github.com/Azure/aks-engine/pull/4656/files so I would need release 1.4.13

@rbtr
Copy link
Collaborator

rbtr commented Oct 11, 2021

@davinci26 v1.4.13 is released, includes your change

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.

[CNI Windows] Add support for L4WFPProxyPolicy

4 participants