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

Correct SR-IOV resourceName prefix in network attachment definitions form #3201

Conversation

pcbailey
Copy link
Contributor

@pcbailey pcbailey commented Nov 3, 2019

This PR corrects the prefix for the SR-IOV network type changing it from bridge.network.kubevirt.io to openshift.io. Example YAML output is below:

apiVersion: k8s.cni.cncf.io/v1
kind: NetworkAttachmentDefinition
metadata:
  annotations:
    k8s.v1.cni.cncf.io/resourceName: openshift.io/sriov_net
  creationTimestamp: '2019-11-03T22:32:40Z'
  generation: 1
  name: test-sriov
  namespace: test-project
  resourceVersion: '3811298'
  selfLink: >-
    /apis/k8s.cni.cncf.io/v1/namespaces/test-project/network-attachment-definitions/test-sriov
  uid: d841499b-fe89-11e9-bf66-525400f2bdf7
spec:
  config: '{"name":"test-sriov","type":"sriov","cniVersion":"0.3.1","ipam":{}}'

@phoracek

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 3, 2019
@phoracek
Copy link
Member

phoracek commented Nov 3, 2019

@fedepaol could you please check that the NetworkAttachmentDefinition is valid?

@pcbailey pcbailey force-pushed the fix-sriov-resource-name-property branch from b33a770 to f50249b Compare November 3, 2019 22:50
@fedepaol
Copy link
Member

fedepaol commented Nov 4, 2019

/lgtm

One note: the openshift.io prefix depends on the fact that the resource is being set up by the sr-iov operator (but I think this is the case).
Also, in our tests / examples I don't recall setting the cniVersion value.

@openshift-ci-robot
Copy link
Contributor

@fedepaol: changing LGTM is restricted to collaborators

In response to this:

/lgtm

One note: the openshift.io prefix depends on the fact that the resource is being set up by the sr-iov operator (but I think this is the case).
Also, in our tests / examples I don't recall setting the cniVersion value.

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.

@phoracek
Copy link
Member

phoracek commented Nov 4, 2019

@fedepaol we don't set it there. But we should be explicit about the version, I think it is even required with some newer releases of Multus/kubelet. May be wrong. However, it is specified in SR-IOV operator and it should not do any harm.

https://github.com/openshift/sriov-network-operator/blob/master/bindata/manifests/cni-config/sriov-cni-config.yaml

@pcbailey pcbailey force-pushed the fix-sriov-resource-name-property branch from f50249b to 52d065c Compare November 11, 2019 13:45
@rawagner
Copy link
Contributor

/lgtm

@pcbailey
Copy link
Contributor Author

/retest

1 similar comment
@pcbailey
Copy link
Contributor Author

/retest

@rawagner
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fedepaol, pcbailey, phoracek, rawagner

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pcbailey
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 8c6809f into openshift:master Nov 13, 2019
@spadgett spadgett added this to the v4.3 milestone Nov 19, 2019
@pcbailey pcbailey deleted the fix-sriov-resource-name-property branch October 26, 2022 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants