update network group to use "normal" generation

network/v1/001-clusternetwork-crd.yaml

@@ -3,6 +3,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/527
+    api.openshift.io/merged-by-featuregates: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
   name: clusternetworks.network.openshift.io
 spec:
   group: network.openshift.io
@@ -122,9 +126,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

network/v1/002-hostsubnet-crd.yaml

@@ -3,6 +3,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/527
+    api.openshift.io/merged-by-featuregates: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
   name: hostsubnets.network.openshift.io
 spec:
   group: network.openshift.io
@@ -99,9 +103,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

network/v1/003-netnamespace-crd.yaml

@@ -3,6 +3,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/527
+    api.openshift.io/merged-by-featuregates: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
   name: netnamespaces.network.openshift.io
 spec:
   group: network.openshift.io
@@ -73,9 +77,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

network/v1/004-egressnetworkpolicy-crd.yaml

@@ -3,6 +3,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/527
+    api.openshift.io/merged-by-featuregates: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
   name: egressnetworkpolicies.network.openshift.io
 spec:
   group: network.openshift.io
@@ -82,9 +86,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

network/v1/types.go

@@ -17,10 +17,13 @@ const (
 // when the cluster is brought up for the first time.
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
-// +kubebuilder:resource:scope="Cluster"
-// +kubebuilder:printcolumn:name="Cluster Network",type=string,JSONPath=`.network`,description="The primary cluster network CIDR"
-// +kubebuilder:printcolumn:name="Service Network",type=string,JSONPath=`.serviceNetwork`,description="The service network CIDR"
-// +kubebuilder:printcolumn:name="Plugin Name",type=string,JSONPath=`.pluginName`,description="The Openshift SDN network plug-in in use"
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=clusternetworks,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/527
+// +openshift:file-pattern=001-clusternetworkMARKERS-crd.yaml
+// +kubebuilder:printcolumn:name="Cluster Network",type=string,JSONPath=.network,description="The primary cluster network CIDR"
+// +kubebuilder:printcolumn:name="Service Network",type=string,JSONPath=.serviceNetwork,description="The service network CIDR"
+// +kubebuilder:printcolumn:name="Plugin Name",type=string,JSONPath=.pluginName,description="The OpenShift SDN network plug-in in use"
 // +openshift:compatibility-gen:level=1
 type ClusterNetwork struct {
 	metav1.TypeMeta `json:",inline"`
@@ -113,11 +116,15 @@ type HostSubnetEgressCIDR string
 // same name as the Node object it corresponds to.
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
-// +kubebuilder:printcolumn:name="Host",type=string,JSONPath=`.host`,description="The name of the node"
-// +kubebuilder:printcolumn:name="Host IP",type=string,JSONPath=`.hostIP`,description="The IP address to be used as a VTEP by other nodes in the overlay network"
-// +kubebuilder:printcolumn:name="Subnet",type=string,JSONPath=`.subnet`,description="The CIDR range of the overlay network assigned to the node for its pods"
-// +kubebuilder:printcolumn:name="Egress CIDRs",type=string,JSONPath=`.egressCIDRs`,description="The network egress CIDRs"
-// +kubebuilder:printcolumn:name="Egress IPs",type=string,JSONPath=`.egressIPs`,description="The network egress IP addresses"
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=hostsubnets,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/527
+// +openshift:file-pattern=002-hostsubnetMARKERS-crd.yaml
+// +kubebuilder:printcolumn:name="Host",type=string,JSONPath=.host,description="The name of the node"
+// +kubebuilder:printcolumn:name="Host IP",type=string,JSONPath=.hostIP,description="The IP address to be used as a VTEP by other nodes in the overlay network"
+// +kubebuilder:printcolumn:name="Subnet",type=string,JSONPath=.subnet,description="The CIDR range of the overlay network assigned to the node for its pods"
+// +kubebuilder:printcolumn:name="Egress CIDRs",type=string,JSONPath=.egressCIDRs,description="The network egress CIDRs"
+// +kubebuilder:printcolumn:name="Egress IPs",type=string,JSONPath=.egressIPs,description="The network egress IP addresses"
 // +openshift:compatibility-gen:level=1
 type HostSubnet struct {
 	metav1.TypeMeta `json:",inline"`
@@ -182,8 +189,12 @@ type NetNamespaceEgressIP string
 // (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
-// +kubebuilder:printcolumn:name="NetID",type=integer,JSONPath=`.netid`,description="The network identifier of the network namespace"
-// +kubebuilder:printcolumn:name="Egress IPs",type=string,JSONPath=`.egressIPs`,description="The network egress IP addresses"
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=netnamespaces,scope=Cluster
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/527
+// +openshift:file-pattern=003-netnamespaceMARKERS-crd.yaml
+// +kubebuilder:printcolumn:name="NetID",type=integer,JSONPath=.netid,description="The network identifier of the network namespace"
+// +kubebuilder:printcolumn:name="Egress IPs",type=string,JSONPath=.egressIPs,description="The network egress IP addresses"
 // +openshift:compatibility-gen:level=1
 type NetNamespace struct {
 	metav1.TypeMeta `json:",inline"`
@@ -270,6 +281,10 @@ type EgressNetworkPolicySpec struct {
 // is present) then the traffic will be allowed by default.
 //
 // Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=egressnetworkpolicies,scope=Namespaced
+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/527
+// +openshift:file-pattern=004-egressnetworkpolicyMARKERS-crd.yaml
 // +openshift:compatibility-gen:level=1
 type EgressNetworkPolicy struct {
 	metav1.TypeMeta `json:",inline"`

network/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -0,0 +1,118 @@
+clusternetworks.network.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/527
+  CRDName: clusternetworks.network.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: network.openshift.io
+  HasStatus: false
+  KindName: ClusterNetwork
+  Labels: {}
+  PluralName: clusternetworks
+  PrinterColumns:
+  - description: The primary cluster network CIDR
+    jsonPath: .network
+    name: Cluster Network
+    type: string
+  - description: The service network CIDR
+    jsonPath: .serviceNetwork
+    name: Service Network
+    type: string
+  - description: The OpenShift SDN network plug-in in use
+    jsonPath: .pluginName
+    name: Plugin Name
+    type: string
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: 001-clusternetworkMARKERS-crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+
+egressnetworkpolicies.network.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/527
+  CRDName: egressnetworkpolicies.network.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: network.openshift.io
+  HasStatus: false
+  KindName: EgressNetworkPolicy
+  Labels: {}
+  PluralName: egressnetworkpolicies
+  PrinterColumns: []
+  Scope: Namespaced
+  ShortNames: null
+  TargetFilenamePattern: 004-egressnetworkpolicyMARKERS-crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+
+hostsubnets.network.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/527
+  CRDName: hostsubnets.network.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: network.openshift.io
+  HasStatus: false
+  KindName: HostSubnet
+  Labels: {}
+  PluralName: hostsubnets
+  PrinterColumns:
+  - description: The name of the node
+    jsonPath: .host
+    name: Host
+    type: string
+  - description: The IP address to be used as a VTEP by other nodes in the overlay
+      network
+    jsonPath: .hostIP
+    name: Host IP
+    type: string
+  - description: The CIDR range of the overlay network assigned to the node for its
+      pods
+    jsonPath: .subnet
+    name: Subnet
+    type: string
+  - description: The network egress CIDRs
+    jsonPath: .egressCIDRs
+    name: Egress CIDRs
+    type: string
+  - description: The network egress IP addresses
+    jsonPath: .egressIPs
+    name: Egress IPs
+    type: string
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: 002-hostsubnetMARKERS-crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+
+netnamespaces.network.openshift.io:
+  Annotations: {}
+  ApprovedPRNumber: https://github.com/openshift/api/pull/527
+  CRDName: netnamespaces.network.openshift.io
+  Capability: ""
+  Category: ""
+  FeatureGates: []
+  GroupName: network.openshift.io
+  HasStatus: false
+  KindName: NetNamespace
+  Labels: {}
+  PluralName: netnamespaces
+  PrinterColumns:
+  - description: The network identifier of the network namespace
+    jsonPath: .netid
+    name: NetID
+    type: integer
+  - description: The network egress IP addresses
+    jsonPath: .egressIPs
+    name: Egress IPs
+    type: string
+  Scope: Cluster
+  ShortNames: null
+  TargetFilenamePattern: 003-netnamespaceMARKERS-crd.yaml
+  TopLevelFeatureGates: []
+  Version: v1
+