Skip to content

Commit 1331311

Browse files
authored
Merge pull request #42 from ArangoGutierrez/pre020fix
fix wrong variable naming leading to failing deployment
2 parents 0a27d66 + bad3962 commit 1331311

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

manifests/0500_crd.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ spec:
5555
namespace:
5656
pattern: '[a-zA-Z0-9\.\-\/]+'
5757
type: string
58-
nfd-worker:
58+
workerConfig:
5959
description: NFD configuration files
6060
type: object
6161
required:
62-
- config
62+
- configData
6363
properties:
64-
config:
64+
configData:
6565
description: NFD Worker configuration file
6666
type: string
6767
status:
68-
type: object
68+
type: object

pkg/controller/nodefeaturediscovery/nodefeaturediscovery_controls.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ func ConfigMap(n NFD) (ResourceStatus, error) {
258258
obj.SetNamespace(n.ins.GetNamespace())
259259

260260
// Update ConfigMap
261-
obj.ObjectMeta.Name = "nfd-worker-conf"
262-
obj.Data["nfd-worker-conf"] = n.ins.Spec.WorkerConfig.Data()
261+
obj.ObjectMeta.Name = "nfd-worker"
262+
obj.Data["nfd-worker-conf"] = n.ins.Spec.WorkerConfig.ConfigData
263263

264264
found := &corev1.ConfigMap{}
265265
logger := log.WithValues("ConfigMap", obj.Name, "Namespace", obj.Namespace)

0 commit comments

Comments
 (0)