diff --git a/pkg/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go index 788750d9914..896cace6ea9 100644 --- a/pkg/apis/eksctl.io/v1alpha5/types.go +++ b/pkg/apis/eksctl.io/v1alpha5/types.go @@ -620,7 +620,7 @@ type NodeGroup struct { // +optional MaxSize *int `json:"maxSize,omitempty"` // +optional - MetricsCollection []MetricsCollection `json:"metricsCollection,omitempty"` + ASGMetricsCollection []MetricsCollection `json:"metricsCollection,omitempty"` // +optional EBSOptimized *bool `json:"ebsOptimized,omitempty"` @@ -806,8 +806,6 @@ type ScalingConfig struct { MinSize *int `json:"minSize,omitempty"` // +optional MaxSize *int `json:"maxSize,omitempty"` - // +optional - MetricsCollection []MetricsCollection `json:"metricsCollection,omitempty"` } // ManagedNodeGroup defines an EKS-managed nodegroup diff --git a/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go b/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go index 98c6849bd6e..09279b71461 100644 --- a/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go +++ b/pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go @@ -671,8 +671,8 @@ func (in *NodeGroup) DeepCopyInto(out *NodeGroup) { *out = new(int) **out = **in } - if in.MetricsCollection != nil { - in, out := &in.MetricsCollection, &out.MetricsCollection + if in.ASGMetricsCollection != nil { + in, out := &in.ASGMetricsCollection, &out.ASGMetricsCollection *out = make([]MetricsCollection, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go index 8beae6c86a2..f2f3e84182c 100644 --- a/pkg/cfn/builder/nodegroup.go +++ b/pkg/cfn/builder/nodegroup.go @@ -274,8 +274,8 @@ func nodeGroupResource(launchTemplateName *gfn.Value, vpcZoneIdentifier interfac if ng.MaxSize != nil { ngProps["MaxSize"] = fmt.Sprintf("%d", *ng.MaxSize) } - if len(ng.MetricsCollection) > 0 { - ngProps["MetricsCollection"] = ng.MetricsCollection + if len(ng.ASGMetricsCollection) > 0 { + ngProps["ASGMetricsCollection"] = ng.ASGMetricsCollection } if len(ng.ClassicLoadBalancerNames) > 0 { ngProps["LoadBalancerNames"] = ng.ClassicLoadBalancerNames