backup - 04/20/20 12:37:23 PM

eksctl-io · Apr 20, 2020 · 9631ca4 · 9631ca4
1 parent 10a8a3b
commit 9631ca4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
diff --git 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