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.

Sign up for GitHub

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

Jump to bottom

Multus CNI updates for OCP 4.6 #71

Merged

openshift-merge-robot merged 39 commits into openshift:master from dougbtv:openshift-46-updates-07-2020

Jul 25, 2020

Member

dougbtv commented Jul 22, 2020

Notably, this includes updates to vendored packages.

ICucos and others added 30 commits

March 16, 2020 13:19


          Daemonset for Google Kubernetes Engine for kubernetes cluster version…

1bc8064

… 1.16 +. To be able to start cluster with version 1.16 i used rapid channel "gcloud beta container clusters create cluster --zone europe-west1-b --num-nodes=1 --machine-type=n1-standard-8 --image-type ubuntu --enable-network-policy --release-channel=rapid --enable-autorepair"


          Daemonset for Google Kubernetes Engine for kubernetes cluster version…

b6bfb75

… pre 1.16. To be able to start cluster with version 1.15 i used "gcloud container clusters create cl-name --zone europe-west1-b --num-nodes=2 --machine-type=n1-standard-8 --image-type ubuntu --enable-network-policy --cluster-version=1.15.9-gke.24". !!!!important to start the cluster with --enable-network-policy that will enable CNI in kublet


          Add description fields to NetworkAttachmentDefinition CRD

8fff5aa


          Fix pre 1.16 api version for CRDs

3ddc625


          Updates Dockerfile to golang 1.13 (specifying version)

81297f5


          Check Pod parameter against nil before calling Eventf

1df1e4f

Signed-off-by: Ted Yu <yuzhihong@gmail.com>


          Add error message in case of unexpected situation

ab073f8

To troubleshooting #481, adds error message for further analysis.


          Skip docker push action if REPOSITORY_PASS is not set

aeaf78a


          Merge pull request #487 from redhat-nfvpe/dev/test

8dba1f4

Skip docker push action if REPOSITORY_PASS is not set


          Allows namespaceIsolation to allow pods in any namespace refer to the…

931c125

… default namespace


          Sets the Kubernetes API calls timeout to 60 seconds

92beb4b


          Adds development docs note regarding issue policy

c8fc357


          Simplify error message in case of delegating CNI error

b2439f8

This fix removes redundant error messages and try to simplify
if the error comes from delegating CNI plugins.


          Merge pull request #497 from s1061123/fix/improve-cni-logs

a4c2b67

[WIP] Fix/improve cni logs


          Merge pull request #455 from cucosion/feature/gkeexample

b8540e1

Daemonset for Google Kubernetes Engine for kubernetes cluster version…


          Move pre-1.16 Kubernetes assets to a deprecated folder (to later remove)

ec5fd6c


          Introduce gopkg.in for go module

4eac660

This change introduces gopkg.in to allow everyone to use multus
code as library. Currently multus-cni uses version 'v3', hence
it hits go modules limitation, as #504 describes.

This change fix #504 with gopkg.in.


          Simplify examples directory


          Add deviceid in clusterNetwork

c976f6b


          Merge pull request #507 from s1061123/dev/update-example

fdd7d30

Simplify examples directory


          Change the error handling for kubernetes client

f5dcb9d

This change adds retry to wait a bit if kubernetes client
returns service unavailable.

This fixes #492


          Adds code of conduct

809a16f


          Merge pull request #511 from s1061123/fix/error-on-fail

fff8e49

Change the error handling for kubernetes client


          Fix network status name/namespace to compliant with multi-net-spec

e7c8977

This fix changes network status name to net-attach-def name with
namespace, to compliant with k8s npwg's multi-net-spec.


          README typo for roll-YOUR-own

28bb98f


          Merge pull request #518 from dougbtv/readme-typo

5e15ff1

README typo for roll-YOUR-own


          Merge pull request #515 from s1061123/fix/namespace-in-status

3882e40

Fix network status name/namespace to compliant with multi-net-spec


          Add support for log rotation

ecb7933

When using debug level the log files tends to fill up quickly.
Add support for log rotation using lumberjack, simple and easy to use
log rotation module.

Signed-off-by: Shahar Klein <sklein@nvidia.com>


          build: Enable -mod build flag to be toggled via environment variable

a167d54

This change will enable builds to be performed with the option of
passing the -mod flag to 'go build'. This can be done by optionally
setting the MODMODE environment variable prior to building.

For example, toggling the -mod setting for the build can be
accomplished as follows:

```
$ MODMODE=vendor ./build
```

Signed-off-by: Ryan Tidwell <rtidwell@suse.com>


          Struct updates

46be700

- Add `infinibandGUID` CNI runtime config
- Add `infiniband-guid` Network attachment attribute
- Reflect infiniband guid request in Delegate network config

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

23 similar comments

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jul 25, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot merged commit 91c7526 into openshift:master

smarterclayton commented Jul 27, 2020

How did this merge with the network name break? It seems like this should have failed to merge?

smarterclayton commented Jul 27, 2020

This appears to be kubernetes/kubernetes#58711, which was fixed in 3.11 in openshift/origin@a6e1db6 but has not been deployed to api.ci. We either need to update the node or stop running pods on that.

Member Author

dougbtv commented Jul 27, 2020 •

edited

@smarterclayton thanks for the heads up -- I might need a little more info.

How did this merge with the network name break? It seems like this should have failed to merge?

I'm unsure where this test may be, so I can't answer how. I did look at your reference of openshift/origin@a6e1db6 and I was specifically looking for any mention of using the networks-status annotation, specifically the changes made in this upstream PR https://github.com/intel/multus-cni/pull/515/files (which looks the closest to the description of "with the network name break") from this particular change set. However, I failed to find a reference -- I may be looking at the wrong thing.

To continue along that line, regarding https://github.com/intel/multus-cni/pull/515/files -- what this changes specifically the contents of an annotation on pods as processed by Multus, an annotation titled: k8s.v1.cni.cncf.io/networks-status (which is defined by the NPWG spec in section 5) this contains a JSON field, titled "name", which used to refer to the name of a network attachment definition. This change makes it so instead of referring to the name of a network attachment definition, it refers to the name and namespace of the network attachment definition, e.g. if you have a net-attach-def named bar in a namespace called foo the results of the name field of this JSON object will be foo/bar (whereas previously it was just bar).

In the meanwhile, @s1061123 is putting in a PR which reverts this change to k8s.v1.cni.cncf.io/networks-status as a stop-gap here, in case CI is broken elsewhere. @s1061123 also noted that he saw an inconsistency in CI (my notes suffered here, but, I think it was depending on a bot re-run? unsure. it was alarming enough to make us consider the revert).

Contributor

s1061123 commented Jul 28, 2020

@smarterclayton @dougbtv Filed revert PR as #72 .

Member

fedepaol commented Jul 28, 2020

@smarterclayton looks line the e2e-aws lane never passed: https://prow.ci.openshift.org/pr-history/?org=openshift&repo=multus-cni&pr=71 .
The run the bot says was successful lasted 5 seconds: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_multus-cni/71/pull-ci-openshift-multus-cni-master-e2e-aws/1287051359769595904

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment