Merge pull request openshift#928 from SchSeba/merge-bot-master

OCPBUGS-23795,OCPBUGS-33186: Merge https://github.com/k8snetworkplumbingwg/sriov-network-operator:master into master
zeeke · May 8, 2024 · 2b61056 · 2b61056
2 parents 3b79f5e + 852e2b7
commit 2b61056
Show file tree

Hide file tree

Showing 104 changed files with 2,536 additions and 1,115 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,6 +46,9 @@ jobs:
     - name: test cmd
       run: make test-cmd
 
+    - name: test api
+      run: make test-api
+
     - name: test controllers on opensfhit
       run: CLUSTER_TYPE=openshift make test-controllers
 
@@ -106,6 +109,9 @@ jobs:
     - name: test cmd
       run: make test-cmd
 
+    - name: test api
+      run: make test-api
+
     - name: test controllers on opensfhit
       run: CLUSTER_TYPE=openshift make test-controllers
 

diff --git a/Makefile b/Makefile
@@ -147,7 +147,7 @@ mock-generate: gomock
 
 CONTROLLER_GEN = $(BIN_DIR)/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0)
+	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
 
 KUSTOMIZE = $(BIN_DIR)/kustomize
 kustomize: ## Download kustomize locally if necessary.

diff --git a/api/v1/testdata/TestIBRendering/simpleib.golden b/api/v1/testdata/TestIBRendering/simpleib.golden
@@ -9,6 +9,6 @@
     "namespace": "testnamespace"
   },
   "spec": {
-    "config": "{ \"cniVersion\":\"0.3.1\", \"name\":\"\",\"type\":\"ib-sriov\",\"capabilities\":foo,\"ipam\":{} }"
+    "config": "{ \"cniVersion\":\"1.0.0\", \"name\":\"\",\"type\":\"ib-sriov\",\"capabilities\":foo,\"ipam\":{} }"
   }
 }
diff --git a/api/v1/testdata/TestRendering/chained.golden b/api/v1/testdata/TestRendering/chained.golden
@@ -9,6 +9,6 @@
     "namespace": "testnamespace"
   },
   "spec": {
-    "config": "{ \"cniVersion\":\"0.3.1\", \"name\":\"\",\"plugins\": [ {\"type\":\"sriov\",\"vlan\":0,\"vlanQoS\":0,\"ipam\":{} },\n{ \"type\": \"vrf\", \"vrfname\": \"blue\" }\n] }"
+    "config": "{ \"cniVersion\":\"1.0.0\", \"name\":\"\",\"plugins\": [ {\"type\":\"sriov\",\"vlan\":0,\"vlanQoS\":0,\"ipam\":{} },\n{ \"type\": \"vrf\", \"vrfname\": \"blue\" }\n] }"
   }
 }
diff --git a/api/v1/testdata/TestRendering/simple.golden b/api/v1/testdata/TestRendering/simple.golden
@@ -9,6 +9,6 @@
     "namespace": "testnamespace"
   },
   "spec": {
-    "config": "{ \"cniVersion\":\"0.3.1\", \"name\":\"\",\"type\":\"sriov\",\"vlan\":0,\"vlanQoS\":0,\"ipam\":{} }"
+    "config": "{ \"cniVersion\":\"1.0.0\", \"name\":\"\",\"type\":\"sriov\",\"vlan\":0,\"vlanQoS\":0,\"ipam\":{} }"
   }
 }
diff --git a/bindata/manifests/cni-config/sriov-cni-config.yaml b/bindata/manifests/cni-config/sriov-cni-config.yaml
@@ -7,7 +7,7 @@ metadata:
     k8s.v1.cni.cncf.io/resourceName: {{.SriovCniResourceName}}
 spec:
   config: '{
-  "cniVersion":"0.3.1",
+  "cniVersion":"1.0.0",
   "name":"{{.SriovNetworkName}}",
 {{- if .MetaPluginsConfigured -}}
   "plugins": [

diff --git a/bindata/manifests/sriov-config-service/kubernetes/sriov-config-post-network-service.yaml b/bindata/manifests/sriov-config-service/kubernetes/sriov-config-post-network-service.yaml
@@ -1,15 +1,15 @@
 contents: |
   [Unit]
   Description=Configures SRIOV NIC - post network configuration
-  After=systemd-networkd-wait-online.service NetworkManager-wait-online.service
-  Before=network-online.target
+  After=systemd-networkd-wait-online.service NetworkManager-wait-online.service openvswitch-switch.service
+  Before=kubelet.service
 
   [Service]
   Type=oneshot
   ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 --zap-log-level 2 service --phase post
   StandardOutput=journal+console
 
   [Install]
-  WantedBy=network-online.target
+  WantedBy=multi-user.target
 enabled: true
 name: sriov-config-post-network.service
diff --git a/bindata/manifests/sriov-config-service/openshift/sriov-config-service.yaml b/bindata/manifests/sriov-config-service/openshift/sriov-config-service.yaml
@@ -33,15 +33,15 @@ spec:
             # Removal of this file signals firstboot completion
             ConditionPathExists=!/etc/ignition-machine-config-encapsulated.json
             Description=Configures SRIOV NIC - post network configuration
-            After=systemd-networkd-wait-online.service NetworkManager-wait-online.service
-            Before=network-online.target
+            After=systemd-networkd-wait-online.service NetworkManager-wait-online.service openvswitch-switch.service
+            Before=kubelet.service
 
             [Service]
             Type=oneshot
             ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }} --zap-log-level {{ .LogLevel }} --phase post
             StandardOutput=journal+console
 
             [Install]
-            WantedBy=network-online.target
+            WantedBy=multi-user.target
           enabled: true
           name: "sriov-config-post-network.service"
diff --git a/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml b/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
@@ -100,7 +100,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/openshift/origin-sriov-network-operator:4.16
-    createdAt: "2024-04-18T13:41:29Z"
+    createdAt: "2024-05-07T23:50:52Z"
     description: An operator for configuring SR-IOV components and initializing SRIOV
       network devices in Openshift cluster.
     features.operators.openshift.io/cnf: "false"

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovibnetworks.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovibnetworks.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: sriovibnetworks.sriovnetwork.openshift.io
 spec:
@@ -20,23 +20,29 @@ spec:
         description: SriovIBNetwork is the Schema for the sriovibnetworks API
         properties:
           apiVersion:
-            description: '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'
+            description: |-
+              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
             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'
+            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: SriovIBNetworkSpec defines the desired state of SriovIBNetwork
             properties:
               capabilities:
-                description: 'Capabilities to be configured for this network. Capabilities
-                  supported: (infinibandGUID), e.g. ''{"infinibandGUID": true}'''
+                description: |-
+                  Capabilities to be configured for this network.
+                  Capabilities supported: (infinibandGUID), e.g. '{"infinibandGUID": true}'
                 type: string
               ipam:
                 description: IPAM configuration to be used for this network.
@@ -49,8 +55,9 @@ spec:
                 - disable
                 type: string
               metaPlugins:
-                description: MetaPluginsConfig configuration to be used in order to
-                  chain metaplugins to the sriov interface returned by the operator.
+                description: |-
+                  MetaPluginsConfig configuration to be used in order to chain metaplugins to the sriov interface returned
+                  by the operator.
                 type: string
               networkNamespace:
                 description: Namespace of the NetworkAttachmentDefinition custom resource

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: sriovnetworknodepolicies.sriovnetwork.openshift.io
 spec:
@@ -21,14 +21,19 @@ spec:
           API
         properties:
           apiVersion:
-            description: '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'
+            description: |-
+              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
             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'
+            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

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: sriovnetworknodestates.sriovnetwork.openshift.io
 spec:
@@ -34,14 +34,19 @@ spec:
           API
         properties:
           apiVersion:
-            description: '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'
+            description: |-
+              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
             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'
+            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

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: sriovnetworkpoolconfigs.sriovnetwork.openshift.io
 spec:
@@ -21,14 +21,19 @@ spec:
           API
         properties:
           apiVersion:
-            description: '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'
+            description: |-
+              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
             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'
+            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
@@ -39,13 +44,15 @@ spec:
                 anyOf:
                 - type: integer
                 - type: string
-                description: "maxUnavailable defines either an integer number or percentage
-                  of nodes in the pool that can go Unavailable during an update. \n
-                  A value larger than 1 will mean multiple nodes going unavailable
-                  during the update, which may affect your workload stress on the
-                  remaining nodes. Drain will respect Pod Disruption Budgets (PDBs)
-                  such as etcd quorum guards, even if maxUnavailable is greater than
-                  one."
+                description: |-
+                  maxUnavailable defines either an integer number or percentage
+                  of nodes in the pool that can go Unavailable during an update.
+
+
+                  A value larger than 1 will mean multiple nodes going unavailable during
+                  the update, which may affect your workload stress on the remaining nodes.
+                  Drain will respect Pod Disruption Budgets (PDBs) such as etcd quorum guards,
+                  even if maxUnavailable is greater than one.
                 x-kubernetes-int-or-string: true
               nodeSelector:
                 description: nodeSelector specifies a label selector for Nodes
@@ -54,24 +61,24 @@ spec:
                     description: matchExpressions is a list of label selector requirements.
                       The requirements are ANDed.
                     items:
-                      description: A label selector requirement is a selector that
-                        contains values, a key, and an operator that relates the key
-                        and values.
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
                       properties:
                         key:
                           description: key is the label key that the selector applies
                             to.
                           type: string
                         operator:
-                          description: operator represents a key's relationship to
-                            a set of values. Valid operators are In, NotIn, Exists
-                            and DoesNotExist.
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
                           type: string
                         values:
-                          description: values is an array of string values. If the
-                            operator is In or NotIn, the values array must be non-empty.
-                            If the operator is Exists or DoesNotExist, the values
-                            array must be empty. This array is replaced during a strategic
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
                             merge patch.
                           items:
                             type: string
@@ -84,22 +91,24 @@ spec:
                   matchLabels:
                     additionalProperties:
                       type: string
-                    description: matchLabels is a map of {key,value} pairs. A single
-                      {key,value} in the matchLabels map is equivalent to an element
-                      of matchExpressions, whose key field is "key", the operator
-                      is "In", and the values array contains only "value". The requirements
-                      are ANDed.
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               ovsHardwareOffloadConfig:
                 description: OvsHardwareOffloadConfig describes the OVS HWOL configuration
                   for selected Nodes
                 properties:
                   name:
-                    description: 'Name is mandatory and must be unique. On Kubernetes:
-                      Name is the name of OvsHardwareOffloadConfig On OpenShift: Name
-                      is the name of MachineConfigPool to be enabled with OVS hardware
-                      offload'
+                    description: |-
+                      Name is mandatory and must be unique.
+                      On Kubernetes:
+                      Name is the name of OvsHardwareOffloadConfig
+                      On OpenShift:
+                      Name is the name of MachineConfigPool to be enabled with OVS hardware offload
                     type: string
                 type: object
             type: object