Skip to content

Commit

Permalink
Adapt to various changes happening in master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ole Markus With committed Jun 4, 2020
1 parent f53787b commit a9d19ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions nodeup/pkg/model/networking/cilium.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
7 changes: 3 additions & 4 deletions nodeup/pkg/model/networking/flannel.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions nodeup/pkg/model/networking/kubenet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit a9d19ca

Please sign in to comment.