Merge pull request #42 from ArangoGutierrez/pre020fix

fix wrong variable naming leading to failing deployment
kubernetes-sigs · Dec 14, 2020 · 1331311 · 1331311
2 parents 0a27d66 + bad3962
commit 1331311
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
+            type: object
diff --git 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)