Fix name to mapping for intel and simplify apply helper

Signed-off-by: Balazs Nemeth <[email protected]>

Author: bn222

config/manager/manager.yaml

@@ -80,9 +80,15 @@ spec:
           value: quay.io/openshift/origin-dpu-daemon:4.20
         - name: NRIWebhookImage
           value: quay.io/openshift/sriov-dp-admission-controller:latest
-        #TODO: We will need pointers to all supported VSP images so we can dynamically detect the correct vendor to support at runtime
-        # - name: IntelVspImage
-        #   value: quay.io/openshift/origin-intel-vsp-image:4.16
+        # VSP images for different vendors
+        - name: IntelVspImage
+          value: quay.io/openshift/origin-intel-vsp-image:4.16
+        - name: IntelVspP4Image
+          value: quay.io/openshift/origin-intel-vsp-p4-image:4.16
+        - name: MarvellVspImage
+          value: quay.io/openshift/origin-marvell-vsp-image:4.16
+        - name: IntelNetSecVspImage
+          value: quay.io/openshift/origin-intel-netsec-vsp-image:4.16
         image: quay.io/openshift/origin-dpu-operator:4.20
         name: manager
         securityContext:

internal/controller/dataprocessingunit_controller.go

@@ -119,10 +119,8 @@ func (r *DataProcessingUnitReconciler) ensureVSPResources(ctx context.Context, d
 		"Args":                      "[]",
 	}
 
-	// Apply all VSP resources using the existing bindata
-	// Pass nil for owner reference since render function expects DpuOperatorConfig
-	// TODO: Consider creating a generic version that accepts any owner type
-	err = render.ApplyAllFromBinData(logger, "vsp", templateVars, dpuBinData, r.Client, nil, r.Scheme)
+	// Apply all VSP resources using the existing bindata with DPU CR as owner
+	err = render.ApplyAllFromBinData(logger, "vsp", templateVars, dpuBinData, r.Client, dpu)
 	if err != nil {
 		return fmt.Errorf("failed to apply VSP resources: %v", err)
 	}

internal/controller/dpuoperatorconfig_controller.go

@@ -168,7 +168,7 @@ func (r *DpuOperatorConfigReconciler) yamlVars() map[string]string {
 
 func (r *DpuOperatorConfigReconciler) createAndApplyAllFromBinData(logger logr.Logger, binDataPath string, cfg *configv1.DpuOperatorConfig) error {
 	mergedData := images.MergeVarsWithImages(r.imageManager, r.yamlVars())
-	return render.ApplyAllFromBinData(logger, binDataPath, mergedData, binData, r.Client, cfg, r.Scheme)
+	return render.ApplyAllFromBinData(logger, binDataPath, mergedData, binData, r.Client, cfg)
 }
 
 func (r *DpuOperatorConfigReconciler) ensureDpuDeamonSet(ctx context.Context, cfg *configv1.DpuOperatorConfig) error {

internal/daemon/daemon_test.go

@@ -129,7 +129,7 @@ var _ = g.Describe("Full Daemon", func() {
 
 				Expect(err).NotTo(HaveOccurred())
 				Expect(dpuCR.Spec.IsDpuSide).To(BeTrue())
-				Expect(dpuCR.Spec.DpuProductName).To(Equal("Intel IPU"))
+				Expect(dpuCR.Spec.DpuProductName).To(Equal("Intel IPU E2100"))
 				return nil
 			}, 30*time.Second, 2*time.Second).Should(Succeed())
 		})

internal/platform/ipu.go

@@ -24,7 +24,7 @@ type IntelDetector struct {
 }
 
 func NewIntelDetector() *IntelDetector {
-	return &IntelDetector{name: "Intel IPU"}
+	return &IntelDetector{name: "Intel IPU E2100"}
 }
 
 func (d *IntelDetector) Name() string {

pkgs/render/render.go

@@ -13,10 +13,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/apply"
-	configv1 "github.com/openshift/dpu-operator/api/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -57,7 +55,7 @@ func BinDataYamlFiles(dirPath string, binData embed.FS) ([]string, error) {
 	return yamlFileDescriptors, nil
 }
 
-func applyFromBinData(logger logr.Logger, filePath string, data map[string]string, binData embed.FS, client client.Client, cfg *configv1.DpuOperatorConfig, scheme *runtime.Scheme) error {
+func applyObjectFromBinData(logger logr.Logger, filePath string, data map[string]string, binData embed.FS, client client.Client, owner client.Object) error {
 	file, err := binData.Open(filepath.Join("bindata", filePath))
 	if err != nil {
 		return fmt.Errorf("Failed to read file '%s': %v", filePath, err)
@@ -71,8 +69,8 @@ func applyFromBinData(logger logr.Logger, filePath string, data map[string]strin
 	if err != nil {
 		return err
 	}
-	if cfg != nil {
-		if err := ctrl.SetControllerReference(cfg, obj, scheme); err != nil {
+	if owner != nil {
+		if err := ctrl.SetControllerReference(owner, obj, client.Scheme()); err != nil {
 			return err
 		}
 	}
@@ -95,13 +93,13 @@ func applyFromBinData(logger logr.Logger, filePath string, data map[string]strin
 	return nil
 }
 
-func ApplyAllFromBinData(logger logr.Logger, binDataPath string, data map[string]string, binData embed.FS, client client.Client, cfg *configv1.DpuOperatorConfig, scheme *runtime.Scheme) error {
+func ApplyAllFromBinData(logger logr.Logger, binDataPath string, data map[string]string, binData embed.FS, client client.Client, owner client.Object) error {
 	filePaths, err := BinDataYamlFiles(binDataPath, binData)
 	if err != nil {
 		return err
 	}
 	for _, f := range filePaths {
-		err = applyFromBinData(logger, f, data, binData, client, cfg, scheme)
+		err = applyObjectFromBinData(logger, f, data, binData, client, owner)
 		if err != nil {
 			return err
 		}