Skip to content

Commit

Permalink
chore: Include volumeSize, kubeReserved, and systemReserved in …
Browse files Browse the repository at this point in the history
…Instancetype hash calculations (#5816)
  • Loading branch information
engedaam committed Mar 11, 2024
1 parent 24cad47 commit 5a02de8
Showing 1 changed file with 25 additions and 2 deletions.
27 changes: 25 additions & 2 deletions pkg/providers/instancetype/instancetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,32 @@ func (p *Provider) List(ctx context.Context, kc *corev1beta1.KubeletConfiguratio
// Compute fully initialized instance types hash key
subnetHash, _ := hashstructure.Hash(subnets, hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
kcHash, _ := hashstructure.Hash(kc, hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
// TODO: remove kubeReservedHash and systemReservedHash once v1.ResourceList objects are hashed as strings in KubeletConfiguration
// For more information on the v1.ResourceList hash issue: https://github.com/kubernetes-sigs/karpenter/issues/1080
kubeReservedHash, systemReservedHash := uint64(0), uint64(0)
if kc != nil {
kubeReservedHash, _ = hashstructure.Hash(resources.StringMap(kc.KubeReserved), hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.23.x)

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.24.x)

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.25.x)

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.26.x)

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.27.x)

undefined: resources

Check failure on line 118 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.28.x)

undefined: resources
systemReservedHash, _ = hashstructure.Hash(resources.StringMap(kc.SystemReserved), hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources (typecheck)

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources) (typecheck)

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci

undefined: resources) (typecheck)

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.23.x)

undefined: resources

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.24.x)

undefined: resources

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.25.x)

undefined: resources

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.26.x)

undefined: resources

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.27.x)

undefined: resources

Check failure on line 119 in pkg/providers/instancetype/instancetype.go

View workflow job for this annotation

GitHub Actions / ci-test (1.28.x)

undefined: resources
}
blockDeviceMappingsHash, _ := hashstructure.Hash(nodeClass.Spec.BlockDeviceMappings, hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
key := fmt.Sprintf("%d-%d-%d-%016x-%016x-%016x-%s-%t", p.instanceTypesSeqNum, p.instanceTypeOfferingsSeqNum, p.unavailableOfferings.SeqNum, subnetHash, kcHash, blockDeviceMappingsHash, aws.StringValue(nodeClass.Spec.AMIFamily), nodeClass.IsNodeTemplate)

// TODO: remove volumeSizeHash once resource.Quantity objects get hashed as a string in BlockDeviceMappings
// For more information on the resource.Quantity hash issue: https://github.com/aws/karpenter-provider-aws/issues/5447
volumeSizeHash, _ := hashstructure.Hash(lo.Reduce(nodeClass.Spec.BlockDeviceMappings, func(agg string, block *v1beta1.BlockDeviceMapping, _ int) string {
return fmt.Sprintf("%s/%s", agg, block.EBS.VolumeSize)
}, ""), hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
key := fmt.Sprintf("%d-%d-%d-%016x-%016x-%016x-%s-%t-%016x-%016x-%016x",
p.instanceTypesSeqNum,
p.instanceTypeOfferingsSeqNum,
p.unavailableOfferings.SeqNum,
subnetHash,
kcHash,
blockDeviceMappingsHash,
aws.StringValue(nodeClass.Spec.AMIFamily),
nodeClass.IsNodeTemplate,
volumeSizeHash,
kubeReservedHash,
systemReservedHash,
)
if item, ok := p.cache.Get(key); ok {
return item.([]*cloudprovider.InstanceType), nil
}
Expand Down

0 comments on commit 5a02de8

Please sign in to comment.