Bug 1819571: NetworkAttachmentDefinitions should have output for "oc explain"

[dougbtv]

This adds the apiversion, kind and metadata fields for explain to properly function.

@s1061123 can you check and see if this look OK? If it does, we can move forward with backports. Thanks!

[openshift-ci-robot]

@dougbtv: This pull request references Bugzilla bug 1819571, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.0) matches configured target release for branch (4.6.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1819571: NetworkAttachmentDefinitions should have output for "oc explain"

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.

[s1061123]

/retest

[s1061123]

/retest

[s1061123]

/retest

[s1061123]

It looks good to me, thanks!

[s1061123]

/retest

[tssurya]

I'm not very familiar with this object, but this patch does not fully fix the bug right ? I'm guessing it needs to be added to the openshift api part for oc explain to render properly ?

Anyhow, the change itself lgtm!

[s1061123]

@tssurya Here's the manual testing log. oc explain net-attach-def shows its description.

FYI.

# Before that, stopped CNO to replace net-attach-def manually...
[tohayash@tohayash-srv test200729f]$ oc version
Client Version: 4.5.0-0.ci-2020-07-29-002023
Server Version: 4.5.0-0.ci-2020-07-29-002023
Kubernetes Version: v1.18.3
[tohayash@tohayash-srv test200729f]$ cat test.yaml
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
  name: network-attachment-definitions.k8s.cni.cncf.io
spec:
  group: k8s.cni.cncf.io
  scope: Namespaced
  names:
    plural: network-attachment-definitions
    singular: network-attachment-definition
    kind: NetworkAttachmentDefinition
    shortNames:
    - net-attach-def
  versions:
    - name: v1
      served: true
      storage: true
      schema:
        openAPIV3Schema:
          description: 'NetworkAttachmentDefinition is a CRD schema specified by the Network Plumbing
            Working Group to express the intent for attaching pods to one or more logical or physical
            networks. More information available at: https://github.com/k8snetworkplumbingwg/multi-net-spec'
          type: object
          properties:
            apiVersion:
              description: 'APIVersion defines the versioned schema of this represen
                tation of an object. Servers should convert recognized schemas to the
                latest internal value, and may reject unrecognized values. More info:
                https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
              type: string
            kind:
              description: 'Kind is a string value representing the REST resource this
                object represents. Servers may infer this from the endpoint the client
                submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
              type: string
            metadata:
              type: object
            spec:
              description: 'NetworkAttachmentDefinition spec defines the desired state of a network attachment'
              type: object
              properties:
                config:
                  description: 'NetworkAttachmentDefinition config is a JSON-formatted CNI configuration'
                  type: string
[tohayash@tohayash-srv test200729f]$ oc replace -f test.yaml
customresourcedefinition.apiextensions.k8s.io/network-attachment-definitions.k8s.cni.cncf.io replaced
[tohayash@tohayash-srv test200729f]$ oc explain net-attach-def
KIND:     NetworkAttachmentDefinition
VERSION:  k8s.cni.cncf.io/v1

DESCRIPTION:
     NetworkAttachmentDefinition is a CRD schema specified by the Network
     Plumbing Working Group to express the intent for attaching pods to one or
     more logical or physical networks. More information available at:
     https://github.com/k8snetworkplumbingwg/multi-net-spec

FIELDS:
   apiVersion   <string>
     APIVersion defines the versioned schema of this representation of an
     object. Servers should convert recognized schemas to the latest internal
     value, and may reject unrecognized values. More info:
     https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources

   kind <string>
     Kind is a string value representing the REST resource this object
     represents. Servers may infer this from the endpoint the client submits
     requests to. Cannot be updated. In CamelCase. More info:
     https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds

   metadata     <Object>
     Standard object's metadata. More info:
     https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata

   spec <Object>
     NetworkAttachmentDefinition spec defines the desired state of a network
     attachment

[s1061123]

/retest

[s1061123]

/retest

[tssurya]

thanks tomo for pasting the output.
/lgtm

[s1061123]

/retest

[s1061123]

/retest

[dougbtv]

/test e2e-gcp-upgrade

[s1061123]

/retest

[s1061123]

/retest

[s1061123]

/retest

[dcbw]

/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, dougbtv, tssurya

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:

• OWNERS [dcbw]

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

[openshift-bot]

/retest

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

[dcbw]

/test e2e-gcp-upgrade

[openshift-bot]

/retest

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

[openshift-ci-robot]

@dougbtv: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-openstack	af31672	link	/test e2e-openstack
ci/prow/e2e-aws-sdn-single	af31672	link	/test e2e-aws-sdn-single
ci/prow/e2e-aws-sdn-multi	af31672	link	/test e2e-aws-sdn-multi

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

[openshift-bot]

/retest

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

[openshift-ci-robot]

@dougbtv: All pull requests linked via external trackers have merged: openshift/cluster-network-operator#729. Bugzilla bug 1819571 has been moved to the MODIFIED state.

In response to this:

Bug 1819571: NetworkAttachmentDefinitions should have output for "oc explain"

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.