OSSM-2082 CNI installer now creates the net.d directory if necessary #638

luksa · 2022-10-05T08:51:59Z

No description provided.

cni/pkg/install/kubeconfig.go

luksa · 2022-10-05T12:34:47Z

/test unit

Argh, that flaky StatusManager test.

jwendell · 2022-10-05T13:32:26Z

/test istio-gencheck-2-3
/test istio-lint-2-3
/test istio-unit-2-3

jwendell · 2022-10-05T14:29:30Z

@luksa Should we submit this upstream as well?

luksa · 2022-10-05T14:41:52Z

This isn't needed in upstream, since they always install the plugin into the cluster's main net.d dir, which always exists.

jwendell · 2022-10-05T14:46:44Z

Well, the MountedCNINetDir parameter is present on upstream and is configurable so that vendors like us can use it, and this PR makes it more robust, right? So, IMO we should do that as this will also benefit us in the future rebases. Upstream first policy :)

luksa · 2022-10-05T14:49:15Z

Earlier versions did create the directory, so this was actually removed in upstream.

luksa · 2022-10-05T17:34:47Z

/test lint

openshift-ci · 2022-10-05T17:34:50Z

@luksa: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test istio-gencheck-2-3
/test istio-lint-2-3
/test istio-unit-2-3

Use /test all to run all jobs.

In response to this:

/test lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

luksa · 2022-10-05T17:36:29Z

/test integration-pilot
/test integration-security
/test integration-servicemesh

openshift-ci · 2022-10-05T17:36:31Z

@luksa: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test istio-gencheck-2-3
/test istio-lint-2-3
/test istio-unit-2-3

Use /test all to run all jobs.

In response to this:

/test integration-pilot
/test integration-security
/test integration-servicemesh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

…aistra#638)

…Istio CNI (#688) * [cni] MAISTRA-2132 Support deployment of multiple plugin versions in Istio CNI (#271) Includes: * MAISTRA-2135 Add unit tests for our CNI binary-prefix work (#325) * MAISTRA-2137 Make network namespace setup executable name configurable (#273) To support the deployment of multiple CNI plugin versions, the name of the executable that is invoked to set up the network namespace must be configurable. * OSSM-1430: CNI: Watch for modified files with a prefix (#510) Because our CNI pod contains more than one container, and they write to the same directory, and they watch for changes on those directories, changes made by one container trigger the watch on the other, which will responde by copying the files to the directory, which will in turn trigger the watcher of the other container in an endless loop. This leads to high CPU usage on the node. This PR changes the logic to only monitor for files that have the desired prefix. Thus, for example, the 2.2 container will only react to changes to files whose names start with "v2-2". This avoid this race condition and achieve the same end result. * [cni] MAISTRA-2051 use correct UID/GID in istio-iptables * OSSM-2082 CNI installer now creates the net.d directory if necessary (#638) * fix(lint): replaces deprecated pkg io/ioutil * fix: reverts back to t.TempDir() calls Co-authored-by: Marko Lukša <marko.luksa@gmail.com> Co-authored-by: rcernich <rcernich@redhat.com>

openshift-cherrypick-robot · 2023-06-15T14:15:24Z

In response to a cherrypick label: #638 failed to apply on top of branch "maistra-2.2":

Applying: OSSM-2082 CNI installer now creates the net.d directory if necessary
Using index info to reconstruct a base tree...
M	cni/pkg/install/kubeconfig_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/install/kubeconfig_test.go
CONFLICT (content): Merge conflict in cni/pkg/install/kubeconfig_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSSM-2082 CNI installer now creates the net.d directory if necessary
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

…aistra#638)

…638) (#810)

…Istio CNI (maistra#688) * [cni] MAISTRA-2132 Support deployment of multiple plugin versions in Istio CNI (maistra#271) Includes: * MAISTRA-2135 Add unit tests for our CNI binary-prefix work (maistra#325) * MAISTRA-2137 Make network namespace setup executable name configurable (maistra#273) To support the deployment of multiple CNI plugin versions, the name of the executable that is invoked to set up the network namespace must be configurable. * OSSM-1430: CNI: Watch for modified files with a prefix (maistra#510) Because our CNI pod contains more than one container, and they write to the same directory, and they watch for changes on those directories, changes made by one container trigger the watch on the other, which will responde by copying the files to the directory, which will in turn trigger the watcher of the other container in an endless loop. This leads to high CPU usage on the node. This PR changes the logic to only monitor for files that have the desired prefix. Thus, for example, the 2.2 container will only react to changes to files whose names start with "v2-2". This avoid this race condition and achieve the same end result. * [cni] MAISTRA-2051 use correct UID/GID in istio-iptables * OSSM-2082 CNI installer now creates the net.d directory if necessary (maistra#638) * fix(lint): replaces deprecated pkg io/ioutil * fix: reverts back to t.TempDir() calls Co-authored-by: Marko Lukša <marko.luksa@gmail.com> Co-authored-by: rcernich <rcernich@redhat.com>

…Istio CNI (#688) * [cni] MAISTRA-2132 Support deployment of multiple plugin versions in Istio CNI (#271) Includes: * MAISTRA-2135 Add unit tests for our CNI binary-prefix work (#325) * MAISTRA-2137 Make network namespace setup executable name configurable (#273) To support the deployment of multiple CNI plugin versions, the name of the executable that is invoked to set up the network namespace must be configurable. * OSSM-1430: CNI: Watch for modified files with a prefix (#510) Because our CNI pod contains more than one container, and they write to the same directory, and they watch for changes on those directories, changes made by one container trigger the watch on the other, which will responde by copying the files to the directory, which will in turn trigger the watcher of the other container in an endless loop. This leads to high CPU usage on the node. This PR changes the logic to only monitor for files that have the desired prefix. Thus, for example, the 2.2 container will only react to changes to files whose names start with "v2-2". This avoid this race condition and achieve the same end result. * [cni] MAISTRA-2051 use correct UID/GID in istio-iptables * OSSM-2082 CNI installer now creates the net.d directory if necessary (#638) * fix(lint): replaces deprecated pkg io/ioutil * fix: reverts back to t.TempDir() calls Co-authored-by: Marko Lukša <marko.luksa@gmail.com> Co-authored-by: rcernich <rcernich@redhat.com>

…Istio CNI (maistra#688) * [cni] MAISTRA-2132 Support deployment of multiple plugin versions in Istio CNI (maistra#271) Includes: * MAISTRA-2135 Add unit tests for our CNI binary-prefix work (maistra#325) * MAISTRA-2137 Make network namespace setup executable name configurable (maistra#273) To support the deployment of multiple CNI plugin versions, the name of the executable that is invoked to set up the network namespace must be configurable. * OSSM-1430: CNI: Watch for modified files with a prefix (maistra#510) Because our CNI pod contains more than one container, and they write to the same directory, and they watch for changes on those directories, changes made by one container trigger the watch on the other, which will responde by copying the files to the directory, which will in turn trigger the watcher of the other container in an endless loop. This leads to high CPU usage on the node. This PR changes the logic to only monitor for files that have the desired prefix. Thus, for example, the 2.2 container will only react to changes to files whose names start with "v2-2". This avoid this race condition and achieve the same end result. * [cni] MAISTRA-2051 use correct UID/GID in istio-iptables * OSSM-2082 CNI installer now creates the net.d directory if necessary (maistra#638) * fix(lint): replaces deprecated pkg io/ioutil * fix: reverts back to t.TempDir() calls Co-authored-by: Marko Lukša <marko.luksa@gmail.com> Co-authored-by: rcernich <rcernich@redhat.com>

…Istio CNI (#688) * [cni] MAISTRA-2132 Support deployment of multiple plugin versions in Istio CNI (#271) Includes: * MAISTRA-2135 Add unit tests for our CNI binary-prefix work (#325) * MAISTRA-2137 Make network namespace setup executable name configurable (#273) To support the deployment of multiple CNI plugin versions, the name of the executable that is invoked to set up the network namespace must be configurable. * OSSM-1430: CNI: Watch for modified files with a prefix (#510) Because our CNI pod contains more than one container, and they write to the same directory, and they watch for changes on those directories, changes made by one container trigger the watch on the other, which will responde by copying the files to the directory, which will in turn trigger the watcher of the other container in an endless loop. This leads to high CPU usage on the node. This PR changes the logic to only monitor for files that have the desired prefix. Thus, for example, the 2.2 container will only react to changes to files whose names start with "v2-2". This avoid this race condition and achieve the same end result. * [cni] MAISTRA-2051 use correct UID/GID in istio-iptables * OSSM-2082 CNI installer now creates the net.d directory if necessary (#638) * fix(lint): replaces deprecated pkg io/ioutil * fix: reverts back to t.TempDir() calls Co-authored-by: Marko Lukša <marko.luksa@gmail.com> Co-authored-by: rcernich <rcernich@redhat.com>

OSSM-2082 CNI installer now creates the net.d directory if necessary

d53999d

maistra-bot added the size/S label Oct 5, 2022

luksa mentioned this pull request Oct 5, 2022

OSSM-1968 Move 2.3 CNI container into separate DaemonSets maistra/istio-operator#1017

Merged

jewertow reviewed Oct 5, 2022

View reviewed changes

cni/pkg/install/kubeconfig.go Show resolved Hide resolved

jewertow approved these changes Oct 5, 2022

View reviewed changes

luksa added the okay to merge label Oct 5, 2022

yxun approved these changes Oct 5, 2022

View reviewed changes

maistra deleted a comment from maistra-bot Oct 5, 2022

maistra deleted a comment from openshift-ci bot Oct 5, 2022

maistra-bot merged commit 255221e into maistra:maistra-2.3 Oct 5, 2022

bartoszmajsak pushed a commit to bartoszmajsak/istio that referenced this pull request Nov 18, 2022

OSSM-2082 CNI installer now creates the net.d directory if necessary (m…

84ed940

…aistra#638)

bartoszmajsak mentioned this pull request Nov 18, 2022

[cni] MAISTRA-2291 Support deployment of multiple plugin versions in Istio CNI #688

Merged

luksa added the cherrypick/maistra-2.2 label Jun 15, 2023

luksa added a commit to luksa/istio-maistra that referenced this pull request Jun 15, 2023

OSSM-2082 CNI installer now creates the net.d directory if necessary (m…

e6584b9

…aistra#638)

openshift-merge-robot pushed a commit that referenced this pull request Jun 22, 2023

OSSM-2082 CNI installer now creates the net.d directory if necessary (#…

e451182

…638) (#810)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OSSM-2082 CNI installer now creates the net.d directory if necessary #638

OSSM-2082 CNI installer now creates the net.d directory if necessary #638

luksa commented Oct 5, 2022

luksa commented Oct 5, 2022

jwendell commented Oct 5, 2022

jwendell commented Oct 5, 2022

luksa commented Oct 5, 2022

jwendell commented Oct 5, 2022

luksa commented Oct 5, 2022

luksa commented Oct 5, 2022

openshift-ci bot commented Oct 5, 2022

luksa commented Oct 5, 2022

openshift-ci bot commented Oct 5, 2022

openshift-cherrypick-robot commented Jun 15, 2023

OSSM-2082 CNI installer now creates the net.d directory if necessary #638

OSSM-2082 CNI installer now creates the net.d directory if necessary #638

Conversation

luksa commented Oct 5, 2022

luksa commented Oct 5, 2022

jwendell commented Oct 5, 2022

jwendell commented Oct 5, 2022

luksa commented Oct 5, 2022

jwendell commented Oct 5, 2022

luksa commented Oct 5, 2022

luksa commented Oct 5, 2022

openshift-ci bot commented Oct 5, 2022

luksa commented Oct 5, 2022

openshift-ci bot commented Oct 5, 2022

openshift-cherrypick-robot commented Jun 15, 2023