From 813e182ab9fe477482ddfc6d0b341d4e343d5d3d Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Tue, 9 Jul 2024 15:26:59 -0700 Subject: [PATCH 1/3] chore: bump go.mod (#6478) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f6363fbd86d6..d5662bb2b9b0 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( k8s.io/utils v0.0.0-20240102154912-e7106e64919e knative.dev/pkg v0.0.0-20231010144348-ca8c009405dd sigs.k8s.io/controller-runtime v0.18.4 - sigs.k8s.io/karpenter v0.37.1-0.20240705194601-4a72da3afe8e + sigs.k8s.io/karpenter v0.37.1-0.20240708235259-bcd33e924905 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index e620716ef0b4..6a77ecf659d0 100644 --- a/go.sum +++ b/go.sum @@ -763,8 +763,8 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/karpenter v0.37.1-0.20240705194601-4a72da3afe8e h1:FriyVb7NI+MsIlHW93QgHDWfhVf8Gt0E2NNYy+WA3Jg= -sigs.k8s.io/karpenter v0.37.1-0.20240705194601-4a72da3afe8e/go.mod h1:Capmf9EwVSBoANOkP5qy4xHBaZ9/y0wUDyh4UzgRJlk= +sigs.k8s.io/karpenter v0.37.1-0.20240708235259-bcd33e924905 h1:4ulecMwrSJl9EunKwfDGBhY0i3vJOYmI1GWs/JzsrjQ= +sigs.k8s.io/karpenter v0.37.1-0.20240708235259-bcd33e924905/go.mod h1:eqRbKU0hmncoJXhh+MI8sCLYTjKDvoVPzo+myhDjvUI= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= From b8c2c88cf37cc839eaab246672d140b1f02e582f Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Wed, 10 Jul 2024 09:27:14 -0700 Subject: [PATCH 2/3] chore: Fix spurious discovered lines in logging (#6481) --- pkg/providers/securitygroup/securitygroup.go | 7 +++---- pkg/providers/subnet/subnet.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/providers/securitygroup/securitygroup.go b/pkg/providers/securitygroup/securitygroup.go index db955dde3e12..6ebb6a83f69b 100644 --- a/pkg/providers/securitygroup/securitygroup.go +++ b/pkg/providers/securitygroup/securitygroup.go @@ -62,11 +62,10 @@ func (p *DefaultProvider) List(ctx context.Context, nodeClass *v1beta1.EC2NodeCl if err != nil { return nil, err } - if p.cm.HasChanged(fmt.Sprintf("security-groups/%s", nodeClass.Name), securityGroups) { + securityGroupIDs := lo.Map(securityGroups, func(s *ec2.SecurityGroup, _ int) string { return aws.StringValue(s.GroupId) }) + if p.cm.HasChanged(fmt.Sprintf("security-groups/%s", nodeClass.Name), securityGroupIDs) { log.FromContext(ctx). - WithValues("security-groups", lo.Map(securityGroups, func(s *ec2.SecurityGroup, _ int) string { - return aws.StringValue(s.GroupId) - })). + WithValues("security-groups", securityGroupIDs). V(1).Info("discovered security groups") } return securityGroups, nil diff --git a/pkg/providers/subnet/subnet.go b/pkg/providers/subnet/subnet.go index 510c9fd2c92f..c80be9c07b59 100644 --- a/pkg/providers/subnet/subnet.go +++ b/pkg/providers/subnet/subnet.go @@ -109,7 +109,7 @@ func (p *DefaultProvider) List(ctx context.Context, nodeClass *v1beta1.EC2NodeCl } } p.cache.SetDefault(fmt.Sprint(hash), lo.Values(subnets)) - if p.cm.HasChanged(fmt.Sprintf("subnets/%s", nodeClass.Name), subnets) { + if p.cm.HasChanged(fmt.Sprintf("subnets/%s", nodeClass.Name), lo.Keys(subnets)) { log.FromContext(ctx). WithValues("subnets", lo.Map(lo.Values(subnets), func(s *ec2.Subnet, _ int) v1beta1.Subnet { return v1beta1.Subnet{ From b46b6858accd90bb5439f40e26fdd7ee1b576b23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:42:10 +0000 Subject: [PATCH 3/3] chore: Update data from AWS APIs (#6485) Co-authored-by: APICodeGen --- pkg/providers/instancetype/zz_generated.bandwidth.go | 12 ++++++++++++ pkg/providers/pricing/zz_generated.pricing_aws.go | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/providers/instancetype/zz_generated.bandwidth.go b/pkg/providers/instancetype/zz_generated.bandwidth.go index b24db18bf0b4..d0f8cbbc83ed 100644 --- a/pkg/providers/instancetype/zz_generated.bandwidth.go +++ b/pkg/providers/instancetype/zz_generated.bandwidth.go @@ -103,6 +103,7 @@ var ( "m7gd.medium": 520, "r7g.medium": 520, "r7gd.medium": 520, + "r8g.medium": 520, "x1e.xlarge": 625, "a1.large": 750, "c5.large": 750, @@ -154,6 +155,7 @@ var ( "m7gd.large": 937, "r7g.large": 937, "r7gd.large": 937, + "r8g.large": 937, "t3.xlarge": 1024, "t3a.xlarge": 1024, "t4g.xlarge": 1024, @@ -212,6 +214,7 @@ var ( "m7gd.xlarge": 1876, "r7g.xlarge": 1876, "r7gd.xlarge": 1876, + "r8g.xlarge": 1876, "g4ad.xlarge": 2000, "t3.2xlarge": 2048, "t3a.2xlarge": 2048, @@ -289,6 +292,7 @@ var ( "m7gd.2xlarge": 3750, "r7g.2xlarge": 3750, "r7gd.2xlarge": 3750, + "r8g.2xlarge": 3750, "m5dn.xlarge": 4100, "m5n.xlarge": 4100, "r5dn.xlarge": 4100, @@ -373,6 +377,7 @@ var ( "r5ad.8xlarge": 7500, "r7g.4xlarge": 7500, "r7gd.4xlarge": 7500, + "r8g.4xlarge": 7500, "m5dn.2xlarge": 8125, "m5n.2xlarge": 8125, "r5dn.2xlarge": 8125, @@ -479,6 +484,7 @@ var ( "m7gd.8xlarge": 15000, "r7g.8xlarge": 15000, "r7gd.8xlarge": 15000, + "r8g.8xlarge": 15000, "x2iezn.4xlarge": 15000, "m5dn.4xlarge": 16250, "m5n.4xlarge": 16250, @@ -529,6 +535,7 @@ var ( "m7gd.12xlarge": 22500, "r7g.12xlarge": 22500, "r7gd.12xlarge": 22500, + "r8g.12xlarge": 22500, "c5.18xlarge": 25000, "c5.24xlarge": 25000, "c5.metal": 25000, @@ -631,6 +638,7 @@ var ( "r7g.metal": 30000, "r7gd.16xlarge": 30000, "r7gd.metal": 30000, + "r8g.16xlarge": 30000, "c6a.24xlarge": 37500, "c6i.24xlarge": 37500, "c6id.24xlarge": 37500, @@ -654,6 +662,8 @@ var ( "d3en.6xlarge": 40000, "g5.12xlarge": 40000, "g6.12xlarge": 40000, + "r8g.24xlarge": 40000, + "r8g.metal-24xl": 40000, "c5n.9xlarge": 50000, "c6a.32xlarge": 50000, "c6a.48xlarge": 50000, @@ -715,6 +725,8 @@ var ( "r7i.metal-48xl": 50000, "r7iz.32xlarge": 50000, "r7iz.metal-32xl": 50000, + "r8g.48xlarge": 50000, + "r8g.metal-48xl": 50000, "u-3tb1.56xlarge": 50000, "x2idn.16xlarge": 50000, "x2iedn.16xlarge": 50000, diff --git a/pkg/providers/pricing/zz_generated.pricing_aws.go b/pkg/providers/pricing/zz_generated.pricing_aws.go index 42a2ccdc1d95..d729268b5d82 100644 --- a/pkg/providers/pricing/zz_generated.pricing_aws.go +++ b/pkg/providers/pricing/zz_generated.pricing_aws.go @@ -16,7 +16,7 @@ limitations under the License. package pricing -// generated at 2024-06-03T13:07:54Z for us-east-1 +// generated at 2024-07-10T14:30:58Z for us-east-1 var InitialOnDemandPricesAWS = map[string]map[string]float64{ // us-east-1 @@ -334,6 +334,10 @@ var InitialOnDemandPricesAWS = map[string]map[string]float64{ "r7iz.12xlarge": 4.464000, "r7iz.16xlarge": 5.952000, "r7iz.2xlarge": 0.744000, "r7iz.32xlarge": 11.904000, "r7iz.4xlarge": 1.488000, "r7iz.8xlarge": 2.976000, "r7iz.large": 0.186000, "r7iz.metal-16xl": 6.547200, "r7iz.metal-32xl": 13.094400, "r7iz.xlarge": 0.372000, + // r8g family + "r8g.12xlarge": 2.827680, "r8g.16xlarge": 3.770240, "r8g.24xlarge": 5.655360, "r8g.2xlarge": 0.471280, + "r8g.48xlarge": 11.310720, "r8g.4xlarge": 0.942560, "r8g.8xlarge": 1.885120, "r8g.large": 0.117820, + "r8g.medium": 0.058910, "r8g.metal-24xl": 6.220900, "r8g.metal-48xl": 11.310720, "r8g.xlarge": 0.235640, // t1 family "t1.micro": 0.020000, // t2 family