kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename NeedUpdate struct to NeedsRollingUpdate

This commit is contained in:
Ole Markus With 2020-11-16 07:27:00 +01:00
parent 2659a30280
commit f4e3dd3e26
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/pkg/api/channel.go
View File

@ -63,10 +63,10 @@ type AddonSpec struct {
// switch kubernetes versions. // switch kubernetes versions.
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
// NeedUpdate determines if we should mark nodes as needing an update. // NeedsRollingUpdate determines if we should mark nodes as needing an update.
// Legal values are control-plane, workers, and all // Legal values are control-plane, workers, and all
// Empty value means no update needed // Empty value means no update needed
NeedUpdate string `json:"needsRollingUpdate,omitempty"` NeedsRollingUpdate string `json:"needsRollingUpdate,omitempty"`
} }
func (a *Addons) Verify() error { func (a *Addons) Verify() error {

6
channels/pkg/channels/addon.go
View File

@ -149,7 +149,7 @@ func (a *Addon) EnsureUpdated(ctx context.Context, k8sClient kubernetes.Interfac
return nil, fmt.Errorf("error applying update from %q: %v", manifestURL, err) return nil, fmt.Errorf("error applying update from %q: %v", manifestURL, err)
} }
if a.Spec.NeedUpdate != "" { if a.Spec.NeedsRollingUpdate != "" {
err = a.AddNeedsUpdateLabel(ctx, k8sClient) err = a.AddNeedsUpdateLabel(ctx, k8sClient)
if err != nil { if err != nil {
return nil, fmt.Errorf("error adding needs-update label: %v", err) return nil, fmt.Errorf("error adding needs-update label: %v", err)
@ -166,9 +166,9 @@ func (a *Addon) EnsureUpdated(ctx context.Context, k8sClient kubernetes.Interfac
} }
func (a *Addon) AddNeedsUpdateLabel(ctx context.Context, k8sClient kubernetes.Interface) error { func (a *Addon) AddNeedsUpdateLabel(ctx context.Context, k8sClient kubernetes.Interface) error {
klog.Infof("addon %v wants to roll %v nodes", a.Name, a.Spec.NeedUpdate) klog.Infof("addon %v wants to update %v nodes", a.Name, a.Spec.NeedsRollingUpdate)
selector := "" selector := ""
switch a.Spec.NeedUpdate { switch a.Spec.NeedsRollingUpdate {
case "control-plane": case "control-plane":
selector = "node-role.kubernetes.io/master=" selector = "node-role.kubernetes.io/master="
case "worker": case "worker":

12
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -877,12 +877,12 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
location := key + "/" + id + "-v1.8.yaml" location := key + "/" + id + "-v1.8.yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(version),
Selector: networkingSelector, Selector: networkingSelector,
Manifest: fi.String(location), Manifest: fi.String(location),
Id: id, Id: id,
NeedUpdate: "all", NeedsRollingUpdate: "all",
}) })
} }
} }