Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug with missing taint translation layer between AWS EKS format and Kubernetes format #6482

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Fixed bug with missing taint translation layer between AWS EKS format and Kubernetes format #6482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74a5500
Fixed bug with missing taint translation layer between AWS EKS format…
wcarlsen Jan 30, 2024
e27ae68
Prevents partial data bugs in the future by returning nil on errors
wcarlsen Jun 13, 2024
bb81dd3
Added link to AWS docs regarding taints
wcarlsen Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion cluster-autoscaler/cloudprovider/aws/aws_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,14 @@ func (m *awsWrapper) getManagedNodegroupInfo(nodegroupName string, clusterName s
taintList := r.Nodegroup.Taints
for _, taint := range taintList {
if taint != nil && taint.Effect != nil && taint.Key != nil && taint.Value != nil {
formattedEffect, err := taintEksTranslator(taint)
if err != nil {
return nil, labels, tags, err
wcarlsen marked this conversation as resolved.
Show resolved Hide resolved
}
taints = append(taints, apiv1.Taint{
Key: *taint.Key,
Value: *taint.Value,
Effect: apiv1.TaintEffect(*taint.Effect),
Effect: apiv1.TaintEffect(formattedEffect),
})
}
}
Expand Down Expand Up @@ -780,3 +784,17 @@ func buildLaunchTemplateFromSpec(ltSpec *autoscaling.LaunchTemplateSpecification
version: version,
}
}

func taintEksTranslator(t *eks.Taint) (apiv1.TaintEffect, error) {
// Translation between AWS EKS and Kubernetes taints
wcarlsen marked this conversation as resolved.
Show resolved Hide resolved
switch effect := *t.Effect; effect {
case eks.TaintEffectNoSchedule:
return apiv1.TaintEffectNoSchedule, nil
case eks.TaintEffectNoExecute:
return apiv1.TaintEffectNoExecute, nil
case eks.TaintEffectPreferNoSchedule:
return apiv1.TaintEffectPreferNoSchedule, nil
default:
return "", fmt.Errorf("couldn't translate EKS DescribeNodegroup response taint %s into Kubernetes format", effect)
}
}
58 changes: 54 additions & 4 deletions cluster-autoscaler/cloudprovider/aws/aws_wrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ func TestGetManagedNodegroup(t *testing.T) {
nodegroupName := "testNodegroup"
clusterName := "testCluster"

taintEffect1 := "effect 1"
taintEffect1 := eks.TaintEffectNoSchedule
taintEffectTranslated1 := apiv1.TaintEffectNoSchedule
taintKey1 := "key 1"
taintValue1 := "value 1"
taint1 := eks.Taint{
Expand All @@ -123,7 +124,8 @@ func TestGetManagedNodegroup(t *testing.T) {
Value: &taintValue1,
}

taintEffect2 := "effect 2"
taintEffect2 := eks.TaintEffectNoExecute
taintEffectTranslated2 := apiv1.TaintEffectNoExecute
taintKey2 := "key 2"
taintValue2 := "value 2"
taint2 := eks.Taint{
Expand Down Expand Up @@ -163,10 +165,10 @@ func TestGetManagedNodegroup(t *testing.T) {
taintList, labelMap, tagMap, err := awsWrapper.getManagedNodegroupInfo(nodegroupName, clusterName)
assert.Nil(t, err)
assert.Equal(t, len(taintList), 2)
assert.Equal(t, taintList[0].Effect, apiv1.TaintEffect(taintEffect1))
assert.Equal(t, taintList[0].Effect, taintEffectTranslated1)
assert.Equal(t, taintList[0].Key, taintKey1)
assert.Equal(t, taintList[0].Value, taintValue1)
assert.Equal(t, taintList[1].Effect, apiv1.TaintEffect(taintEffect2))
assert.Equal(t, taintList[1].Effect, taintEffectTranslated2)
assert.Equal(t, taintList[1].Key, taintKey2)
assert.Equal(t, taintList[1].Value, taintValue2)
assert.Equal(t, len(labelMap), 7)
Expand Down Expand Up @@ -735,3 +737,51 @@ func TestGetInstanceTypesFromInstanceRequirementsWithEmptyList(t *testing.T) {
assert.EqualError(t, err, exp.Error())
assert.Equal(t, "", result)
}

func TestTaintEksTranslator(t *testing.T) {
key := "key"
value := "value"

taintEffect1 := eks.TaintEffectNoSchedule
taintEffectTranslated1 := apiv1.TaintEffectNoSchedule
taint1 := eks.Taint{
Effect: &taintEffect1,
Key: &key,
Value: &value,
}

t1, err := taintEksTranslator(&taint1)
assert.Nil(t, err)
assert.Equal(t, t1, taintEffectTranslated1)

taintEffect2 := eks.TaintEffectNoSchedule
taintEffectTranslated2 := apiv1.TaintEffectNoSchedule
taint2 := eks.Taint{
Effect: &taintEffect2,
Key: &key,
Value: &value,
}
t2, err := taintEksTranslator(&taint2)
assert.Nil(t, err)
assert.Equal(t, t2, taintEffectTranslated2)

taintEffect3 := eks.TaintEffectNoExecute
taintEffectTranslated3 := apiv1.TaintEffectNoExecute
taint3 := eks.Taint{
Effect: &taintEffect3,
Key: &key,
Value: &value,
}
t3, err := taintEksTranslator(&taint3)
assert.Nil(t, err)
assert.Equal(t, t3, taintEffectTranslated3)

taintEffect4 := "TAINT_NO_EXISTS"
taint4 := eks.Taint{
Effect: &taintEffect4,
Key: &key,
Value: &value,
}
_, err = taintEksTranslator(&taint4)
assert.Error(t, err)
}
40 changes: 22 additions & 18 deletions cluster-autoscaler/cloudprovider/aws/managed_nodegroup_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ func TestManagedNodegroupCache(t *testing.T) {
clusterName := "clusterName"
labelKey := "label key 1"
labelValue := "label value 1"
taintEffect := "effect 1"
taintEffect := apiv1.TaintEffectNoSchedule
taintKey := "key 1"
taintValue := "value 1"
tagKey := "tag key 1"
tagValue := "tag value 1"
taint := apiv1.Taint{
Effect: apiv1.TaintEffect(taintEffect),
Effect: taintEffect,
Key: taintKey,
Value: taintValue,
}
Expand Down Expand Up @@ -154,7 +154,8 @@ func TestGetManagedNodegroupWithTaintsAndLabels(t *testing.T) {
labelValue1 := "testValue 1"
labelValue2 := "testValue 2"

taintEffect1 := "effect 1"
taintEffect1 := eks.TaintEffectNoSchedule
taintEffectTranslated1 := apiv1.TaintEffectNoSchedule
taintKey1 := "key 1"
taintValue1 := "value 1"
taint1 := eks.Taint{
Expand All @@ -163,7 +164,8 @@ func TestGetManagedNodegroupWithTaintsAndLabels(t *testing.T) {
Value: &taintValue1,
}

taintEffect2 := "effect 2"
taintEffect2 := eks.TaintEffectNoExecute
taintEffectTranslated2 := apiv1.TaintEffectNoExecute
taintKey2 := "key 2"
taintValue2 := "value 2"
taint2 := eks.Taint{
Expand Down Expand Up @@ -202,10 +204,10 @@ func TestGetManagedNodegroupWithTaintsAndLabels(t *testing.T) {
assert.Equal(t, cacheObj.name, nodegroupName)
assert.Equal(t, cacheObj.clusterName, clusterName)
assert.Equal(t, len(cacheObj.taints), 2)
assert.Equal(t, cacheObj.taints[0].Effect, apiv1.TaintEffect(taintEffect1))
assert.Equal(t, cacheObj.taints[0].Effect, taintEffectTranslated1)
assert.Equal(t, cacheObj.taints[0].Key, taintKey1)
assert.Equal(t, cacheObj.taints[0].Value, taintValue1)
assert.Equal(t, cacheObj.taints[1].Effect, apiv1.TaintEffect(taintEffect2))
assert.Equal(t, cacheObj.taints[1].Effect, taintEffectTranslated2)
assert.Equal(t, cacheObj.taints[1].Key, taintKey2)
assert.Equal(t, cacheObj.taints[1].Value, taintValue2)
assert.Equal(t, len(cacheObj.labels), 7)
Expand Down Expand Up @@ -249,11 +251,11 @@ func TestGetManagedNodegroupInfoObjectWithCachedNodegroup(t *testing.T) {
clusterName := "clusterName"
labelKey := "label key 1"
labelValue := "label value 1"
taintEffect := "effect 1"
taintEffect := apiv1.TaintEffectNoSchedule
taintKey := "key 1"
taintValue := "value 1"
taint := apiv1.Taint{
Effect: apiv1.TaintEffect(taintEffect),
Effect: taintEffect,
Key: taintKey,
Value: taintValue,
}
Expand Down Expand Up @@ -345,11 +347,11 @@ func TestGetManagedNodegroupLabelsWithCachedNodegroup(t *testing.T) {
clusterName := "clusterName"
labelKey := "label key 1"
labelValue := "label value 1"
taintEffect := "effect 1"
taintEffect := apiv1.TaintEffectNoSchedule
taintKey := "key 1"
taintValue := "value 1"
taint := apiv1.Taint{
Effect: apiv1.TaintEffect(taintEffect),
Effect: taintEffect,
Key: taintKey,
Value: taintValue,
}
Expand Down Expand Up @@ -568,7 +570,8 @@ func TestGetManagedNodegroupTaintsNoCachedNodegroup(t *testing.T) {
k8sVersion := "1.19"
diskSize := int64(100)

taintEffect1 := "effect 1"
taintEffect1 := eks.TaintEffectNoExecute
taintEffectTranslated1 := apiv1.TaintEffectNoExecute
taintKey1 := "key 1"
taintValue1 := "value 1"
taint1 := eks.Taint{
Expand All @@ -577,7 +580,8 @@ func TestGetManagedNodegroupTaintsNoCachedNodegroup(t *testing.T) {
Value: &taintValue1,
}

taintEffect2 := "effect 2"
taintEffect2 := eks.TaintEffectPreferNoSchedule
taintEffectTranslated2 := apiv1.TaintEffectPreferNoSchedule
taintKey2 := "key 2"
taintValue2 := "value 2"
taint2 := eks.Taint{
Expand Down Expand Up @@ -608,10 +612,10 @@ func TestGetManagedNodegroupTaintsNoCachedNodegroup(t *testing.T) {
taintsList, err := c.getManagedNodegroupTaints(nodegroupName, clusterName)
require.NoError(t, err)
assert.Equal(t, len(taintsList), 2)
assert.Equal(t, taintsList[0].Effect, apiv1.TaintEffect(taintEffect1))
assert.Equal(t, taintsList[0].Effect, taintEffectTranslated1)
assert.Equal(t, taintsList[0].Key, taintKey1)
assert.Equal(t, taintsList[0].Value, taintValue1)
assert.Equal(t, taintsList[1].Effect, apiv1.TaintEffect(taintEffect2))
assert.Equal(t, taintsList[1].Effect, taintEffectTranslated2)
assert.Equal(t, taintsList[1].Key, taintKey2)
assert.Equal(t, taintsList[1].Value, taintValue2)
k.AssertCalled(t, "DescribeNodegroup", &eks.DescribeNodegroupInput{
Expand All @@ -627,11 +631,11 @@ func TestGetManagedNodegroupTagsWithCachedNodegroup(t *testing.T) {
clusterName := "clusterName"
labelKey := "label key 1"
labelValue := "label value 1"
taintEffect := "effect 1"
taintEffect := apiv1.TaintEffectNoSchedule
taintKey := "key 1"
taintValue := "value 1"
taint := apiv1.Taint{
Effect: apiv1.TaintEffect(taintEffect),
Effect: taintEffect,
Key: taintKey,
Value: taintValue,
}
Expand Down Expand Up @@ -667,7 +671,7 @@ func TestGetManagedNodegroupTagsNoCachedNodegroup(t *testing.T) {
k8sVersion := "1.19"
diskSize := int64(100)

taintEffect1 := "effect 1"
taintEffect1 := eks.TaintEffectNoSchedule
taintKey1 := "key 1"
taintValue1 := "value 1"
taint1 := eks.Taint{
Expand All @@ -676,7 +680,7 @@ func TestGetManagedNodegroupTagsNoCachedNodegroup(t *testing.T) {
Value: &taintValue1,
}

taintEffect2 := "effect 2"
taintEffect2 := eks.TaintEffectPreferNoSchedule
taintKey2 := "key 2"
taintValue2 := "value 2"
taint2 := eks.Taint{
Expand Down
Loading