From 5ad32230bba764b3ec0f8abb1dc0c300ac6f8a4f Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 25 Apr 2021 13:42:12 -0700 Subject: [PATCH] Fix typo --- k8s/crds/kops.k8s.io_instancegroups.yaml | 2 +- pkg/apis/kops/instancegroup.go | 4 ++-- pkg/apis/kops/v1alpha2/instancegroup.go | 4 ++-- pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 4 ++-- pkg/model/awsmodel/autoscalinggroup.go | 2 +- pkg/model/iam.go | 4 ++-- upup/pkg/fi/nodeup/command.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml index ff6f19f71d..b4335ba1ca 100644 --- a/k8s/crds/kops.k8s.io_instancegroups.yaml +++ b/k8s/crds/kops.k8s.io_instancegroups.yaml @@ -907,7 +907,7 @@ spec: group properties: enableLifecycleHook: - description: EnableLifecyleHook determines if an ASG lifecycle + description: EnableLifecycleHook determines if an ASG lifecycle hook will be added ensuring that nodeup runs to completion. Note that the metadata API must be protected from arbitrary Pods when this is enabled. diff --git a/pkg/apis/kops/instancegroup.go b/pkg/apis/kops/instancegroup.go index 75e9dff75d..8f5d892408 100644 --- a/pkg/apis/kops/instancegroup.go +++ b/pkg/apis/kops/instancegroup.go @@ -194,9 +194,9 @@ type WarmPoolSpec struct { // (unless the resulting number is smaller than MinSize). // The default is the instance group's MaxSize. MaxSize *int64 `json:"maxSize,omitempty"` - // EnableLifecyleHook determines if an ASG lifecycle hook will be added ensuring that nodeup runs to completion. + // EnableLifecycleHook determines if an ASG lifecycle hook will be added ensuring that nodeup runs to completion. // Note that the metadata API must be protected from arbitrary Pods when this is enabled. - EnableLifecyleHook bool `json:"enableLifecycleHook,omitempty"` + EnableLifecycleHook bool `json:"enableLifecycleHook,omitempty"` } func (in *WarmPoolSpec) IsEnabled() bool { diff --git a/pkg/apis/kops/v1alpha2/instancegroup.go b/pkg/apis/kops/v1alpha2/instancegroup.go index 92b3f3f464..d73848116f 100644 --- a/pkg/apis/kops/v1alpha2/instancegroup.go +++ b/pkg/apis/kops/v1alpha2/instancegroup.go @@ -159,9 +159,9 @@ type WarmPoolSpec struct { // (unless the resulting number is smaller than MinSize). // The default is the instance group's MaxSize. MaxSize *int64 `json:"maxSize,omitempty"` - // EnableLifecyleHook determines if an ASG lifecycle hook will be added ensuring that nodeup runs to completion. + // EnableLifecycleHook determines if an ASG lifecycle hook will be added ensuring that nodeup runs to completion. // Note that the metadata API must be protected from arbitrary Pods when this is enabled. - EnableLifecyleHook bool `json:"enableLifecycleHook,omitempty"` + EnableLifecycleHook bool `json:"enableLifecycleHook,omitempty"` } // InstanceMetadataOptions defines the EC2 instance metadata service options (AWS Only) diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 385b880e5d..fde9f9f32e 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -6413,7 +6413,7 @@ func Convert_kops_VolumeSpec_To_v1alpha2_VolumeSpec(in *kops.VolumeSpec, out *Vo func autoConvert_v1alpha2_WarmPoolSpec_To_kops_WarmPoolSpec(in *WarmPoolSpec, out *kops.WarmPoolSpec, s conversion.Scope) error { out.MinSize = in.MinSize out.MaxSize = in.MaxSize - out.EnableLifecyleHook = in.EnableLifecyleHook + out.EnableLifecycleHook = in.EnableLifecycleHook return nil } @@ -6425,7 +6425,7 @@ func Convert_v1alpha2_WarmPoolSpec_To_kops_WarmPoolSpec(in *WarmPoolSpec, out *k func autoConvert_kops_WarmPoolSpec_To_v1alpha2_WarmPoolSpec(in *kops.WarmPoolSpec, out *WarmPoolSpec, s conversion.Scope) error { out.MinSize = in.MinSize out.MaxSize = in.MaxSize - out.EnableLifecyleHook = in.EnableLifecyleHook + out.EnableLifecycleHook = in.EnableLifecycleHook return nil } diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index 5823220ad7..85c2c3bdda 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -98,7 +98,7 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error { warmPoolTask.MinSize = warmPool.MinSize warmPoolTask.MaxSize = warmPool.MaxSize - if warmPool.EnableLifecyleHook { + if warmPool.EnableLifecycleHook { name := "kops-warmpool" lifecyleTask := &awstasks.AutoscalingLifecycleHook{ diff --git a/pkg/model/iam.go b/pkg/model/iam.go index 6234609dd3..1b6dd43a20 100644 --- a/pkg/model/iam.go +++ b/pkg/model/iam.go @@ -77,7 +77,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error { for profileARN, igRole := range sharedProfileARNsToIGRole { lchPermissions := false for _, ig := range b.InstanceGroups { - if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecyleHook { + if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecycleHook { lchPermissions = true break @@ -102,7 +102,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error { for igRole := range managedRoles { warmPool := false for _, ig := range b.InstanceGroups { - if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecyleHook { + if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecycleHook { warmPool = true break diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index f34bb346ac..47ca336b2a 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -361,7 +361,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error { klog.Exitf("error closing target: %v", err) } - if modelContext.InstanceGroup.Spec.WarmPool.IsEnabled() && modelContext.InstanceGroup.Spec.WarmPool.EnableLifecyleHook { + if modelContext.InstanceGroup.Spec.WarmPool.IsEnabled() && modelContext.InstanceGroup.Spec.WarmPool.EnableLifecycleHook { if api.CloudProviderID(c.cluster.Spec.CloudProvider) == api.CloudProviderAWS { err := completeWarmingLifecycleAction(cloud.(awsup.AWSCloud), modelContext) if err != nil {