Closed vasrem closed 1 month ago
Files with Coverage Reduction | New Missed Lines | % | ||
---|---|---|---|---|
controllers/macvlannetwork_controller.go | 2 | 86.25% | ||
pkg/state/state_ipoib_network.go | 4 | 75.24% | ||
controllers/ipoibnetwork_controller.go | 7 | 77.38% | ||
<!-- | Total: | 13 | --> |
Totals | |
---|---|
Change from base Build 9252705189: | -0.3% |
Covered Lines: | 3265 |
Relevant Lines: | 5084 |
Bump chart to https://github.com/k8snetworkplumbingwg/sriov-network-operator/tree/8d32f42b42b59a27864043ad22afa3741f197d9a/deployment/sriov-network-operator
This PR does not introduce 1o1 mapping with the upstream chart. There additional configuration related to RDMA CNI.
Here is the diff that is not committed when trying to create 1o1 mapping with the upstream chart.
Current Drift
``` diff --git b/deployment/network-operator/charts/sriov-network-operator/Chart.yaml a/deployment/network-operator/charts/sriov-network-operator/Chart.yaml index 4fffae2..8c7a62e 100644 --- b/deployment/network-operator/charts/sriov-network-operator/Chart.yaml +++ a/deployment/network-operator/charts/sriov-network-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: sriov-network-operator -version: 1.2.0 +version: 0.1.0 kubeVersion: '>= 1.16.0-0' appVersion: 1.2.0 description: SR-IOV network operator configures and manages SR-IOV networks in the kubernetes cluster diff --git b/deployment/network-operator/charts/sriov-network-operator/README.md a/deployment/network-operator/charts/sriov-network-operator/README.md index 56d7c1d..3df54be 100644 --- b/deployment/network-operator/charts/sriov-network-operator/README.md +++ a/deployment/network-operator/charts/sriov-network-operator/README.md @@ -126,6 +126,7 @@ This section contains general parameters that apply to both the operator and dae | `images.sriovCni` | SR-IOV CNI image | | `images.ibSriovCni` | InfiniBand SR-IOV CNI image | | `images.ovsCni` | OVS CNI image | +| `images.rdmaCni` | RDMA CNI image | | `images.sriovDevicePlugin` | SR-IOV device plugin image | | `images.resourcesInjector` | Resources Injector image | | `images.webhook` | Operator Webhook image | diff --git b/deployment/network-operator/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml a/deployment/network-operator/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml index b819999..9b1b2ee 100644 --- b/deployment/network-operator/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml +++ a/deployment/network-operator/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml @@ -103,6 +103,12 @@ spec: offload' type: string type: object + rdmaMode: + description: RDMA subsystem. Allowed value "shared", "exclusive". + enum: + - shared + - exclusive + type: string type: object status: description: SriovNetworkPoolConfigStatus defines the observed state of diff --git b/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml a/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml index 7cd8fd0..3d5afcf 100644 --- b/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml +++ a/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml @@ -58,3 +58,6 @@ rules: - apiGroups: [ "config.openshift.io" ] resources: [ "infrastructures" ] verbs: [ "get", "list", "watch" ] + - apiGroups: [ "sriovnetwork.openshift.io" ] + resources: [ "sriovnetworkpoolconfigs" ] + verbs: [ "get", "list", "watch" ] diff --git b/deployment/network-operator/charts/sriov-network-operator/templates/operator.yaml a/deployment/network-operator/charts/sriov-network-operator/templates/operator.yaml index 1200e34..aa2801b 100644 --- b/deployment/network-operator/charts/sriov-network-operator/templates/operator.yaml +++ a/deployment/network-operator/charts/sriov-network-operator/templates/operator.yaml @@ -58,6 +58,8 @@ spec: value: {{ .Values.images.ibSriovCni }} - name: OVS_CNI_IMAGE value: {{ .Values.images.ovsCni }} + - name: RDMA_CNI_IMAGE + value: {{ .Values.images.rdmaCni }} - name: SRIOV_DEVICE_PLUGIN_IMAGE value: {{ .Values.images.sriovDevicePlugin }} - name: NETWORK_RESOURCES_INJECTOR_IMAGE diff --git b/deployment/network-operator/charts/sriov-network-operator/values.yaml a/deployment/network-operator/charts/sriov-network-operator/values.yaml index 28a4d06..dc76711 100644 --- b/deployment/network-operator/charts/sriov-network-operator/values.yaml +++ a/deployment/network-operator/charts/sriov-network-operator/values.yaml @@ -99,6 +99,7 @@ images: sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni ovsCni: quay.io/kubevirt/ovs-cni-plugin + rdmaCni: ghcr.io/k8snetworkplumbingwg/rdma-cni sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector webhook: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-webhook ```