diff --git a/manifests/0500_crd.yaml b/manifests/0500_crd.yaml index 23ea0a8d..3bf6cbeb 100644 --- a/manifests/0500_crd.yaml +++ b/manifests/0500_crd.yaml @@ -55,14 +55,14 @@ spec: namespace: pattern: '[a-zA-Z0-9\.\-\/]+' type: string - nfd-worker: + workerConfig: description: NFD configuration files type: object required: - - config + - configData properties: - config: + configData: description: NFD Worker configuration file type: string status: - type: object \ No newline at end of file + type: object diff --git a/pkg/controller/nodefeaturediscovery/nodefeaturediscovery_controls.go b/pkg/controller/nodefeaturediscovery/nodefeaturediscovery_controls.go index 04a0f43e..f35efe93 100644 --- a/pkg/controller/nodefeaturediscovery/nodefeaturediscovery_controls.go +++ b/pkg/controller/nodefeaturediscovery/nodefeaturediscovery_controls.go @@ -258,8 +258,8 @@ func ConfigMap(n NFD) (ResourceStatus, error) { obj.SetNamespace(n.ins.GetNamespace()) // Update ConfigMap - obj.ObjectMeta.Name = "nfd-worker-conf" - obj.Data["nfd-worker-conf"] = n.ins.Spec.WorkerConfig.Data() + obj.ObjectMeta.Name = "nfd-worker" + obj.Data["nfd-worker-conf"] = n.ins.Spec.WorkerConfig.ConfigData found := &corev1.ConfigMap{} logger := log.WithValues("ConfigMap", obj.Name, "Namespace", obj.Namespace)