feat: Allow to configure and deploy RDMA CNI image (#896)

Allow to configure and deploy RDMA CNI image

Author: e0ne

deployment/network-operator/values.yaml

@@ -118,7 +118,8 @@ sriov-network-operator:
     sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni:3e6368077716f6b8368b0e036a1290d1c64cf1fb
     ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni:fc002af57a81855542759d0f77d16dacd7e1aa38
     ovsCni: "" # skip deployment by default
-  #  ovsCni: nvcr.io/nvstaging/mellanox/ovs-cni-plugin:8b231bb
+    # ovsCni: nvcr.io/nvstaging/mellanox/ovs-cni-plugin:8b231bb
+    # rdmaCni: ghcr.io/k8snetworkplumbingwg/rdma-cni:latest
     sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:e6ead1e8f76a407783430ee2666b403db2d76f64
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:8810e6a127366cc1eb829d3f7cb3f866d096946e
     webhook: nvcr.io/nvstaging/mellanox/sriov-network-operator-webhook:network-operator-24.4.0-beta.4

hack/release.go

@@ -52,6 +52,7 @@ type Release struct {
 	NicFeatureDiscovery          *mellanoxv1alpha1.ImageSpec
 	DOCATelemetryService         *mellanoxv1alpha1.ImageSpec
 	OVSCni                       *mellanoxv1alpha1.ImageSpec
+	RDMACni                      *mellanoxv1alpha1.ImageSpec
 }
 
 func readDefaults(releaseDefaults string) Release {
@@ -99,6 +100,7 @@ func readEnvironmentVariables(release *Release) {
 	initWithEnvVariale("NIC_FEATURE_DISCOVERY", release.NicFeatureDiscovery)
 	initWithEnvVariale("DOCA_TELEMETRY_SERVICE", release.DOCATelemetryService)
 	initWithEnvVariale("OVS_CNI", release.OVSCni)
+	initWithEnvVariale("RDMA_CNI", release.RDMACni)
 }
 
 func main() {

hack/release.yaml

@@ -73,3 +73,7 @@ ovsCni:
   image: ovs-cni-plugin
   repository: nvcr.io/nvstaging/mellanox
   version: 8b231bb
+rdmaCni:
+  image: rdma-cni
+  repository: ghcr.io/k8snetworkplumbingwg
+  version: latest

hack/templates/values/values.template

@@ -118,7 +118,8 @@ sriov-network-operator:
     sriovCni: {{ .SriovCni.Repository }}/{{ .SriovCni.Image }}:{{ .SriovCni.Version }}
     ibSriovCni: {{ .SriovIbCni.Repository }}/{{ .SriovIbCni.Image }}:{{ .SriovIbCni.Version }}
     ovsCni: "" # skip deployment by default
-  #  ovsCni: {{ .OVSCni.Repository }}/{{ .OVSCni.Image }}:{{ .OVSCni.Version }}
+    # ovsCni: {{ .OVSCni.Repository }}/{{ .OVSCni.Image }}:{{ .OVSCni.Version }}
+    # rdmaCni: {{ .RDMACni.Repository }}/{{ .RDMACni.Image }}:{{ .RDMACni.Version }}
     sriovDevicePlugin: {{ .SriovDevicePlugin.Repository }}/{{ .SriovDevicePlugin.Image }}:{{ .SriovDevicePlugin.Version }}
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:8810e6a127366cc1eb829d3f7cb3f866d096946e
     webhook: {{ .SriovNetworkOperatorWebhook.Repository }}/{{ .SriovNetworkOperatorWebhook.Image }}:{{ .SriovNetworkOperatorWebhook.Version }}