diff --git a/nodeup/pkg/model/networking/cilium.go b/nodeup/pkg/model/networking/cilium.go index c81822fc7511a..10f101eb96319 100644 --- a/nodeup/pkg/model/networking/cilium.go +++ b/nodeup/pkg/model/networking/cilium.go @@ -94,9 +94,9 @@ Type=bpf WantedBy=multi-user.target ` - service, err := nodetasks.NewService("sys-fs-bpf.mount", unit, "") - if err != nil { - return err + service := &nodetasks.Service{ + Name: "sys-fs-bpf.mount", + Definition: fi.String(unit), } c.AddTask(service) } diff --git a/nodeup/pkg/model/networking/flannel.go b/nodeup/pkg/model/networking/flannel.go index 2eda4920e7a47..eae1218a00064 100644 --- a/nodeup/pkg/model/networking/flannel.go +++ b/nodeup/pkg/model/networking/flannel.go @@ -63,10 +63,9 @@ func (b *FlannelBuilder) buildFlannelTxChecksumOffloadDisableService(c *fi.Model manifestString := manifest.Render() klog.V(8).Infof("Built service manifest %q\n%s", serviceName, manifestString) - service, err := nodetasks.NewService(serviceName, manifestString, "") - - if err != nil { - return err + service := &nodetasks.Service{ + Name: serviceName, + Definition: fi.String(manifestString), } c.AddTask(service) diff --git a/nodeup/pkg/model/networking/kubenet.go b/nodeup/pkg/model/networking/kubenet.go index 464b2d6a33caa..57fec0d9c24d9 100644 --- a/nodeup/pkg/model/networking/kubenet.go +++ b/nodeup/pkg/model/networking/kubenet.go @@ -31,10 +31,7 @@ var _ fi.ModelBuilder = &KubenetBuilder{} // Build is responsible for configuring the kube-router func (b *KubenetBuilder) Build(c *fi.ModelBuilderContext) error { - usesKubenet, err := components.UsesKubenet(&b.Cluster.Spec) - if err != nil { - return err - } + usesKubenet := components.UsesKubenet(b.Cluster.Spec.Networking) if !usesKubenet { return nil }