Skip to content

Commit 3a50cf6

Browse files
author
eramirez8
committed
trim quotes from override al os family
Signed-off-by: eramirez8 <[email protected]>
1 parent 5b380c5 commit 3a50cf6

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

controllers/provisioners/eks/eks.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ package eks
1717

1818
import (
1919
"fmt"
20+
"strings"
2021
"sync"
2122

2223
corev1 "k8s.io/api/core/v1"
2324

2425
"github.com/go-logr/logr"
25-
2626
"github.com/keikoproj/instance-manager/api/instancemgr/v1alpha1"
2727
"github.com/keikoproj/instance-manager/controllers/common"
2828
awsprovider "github.com/keikoproj/instance-manager/controllers/providers/aws"
@@ -145,14 +145,15 @@ func (ctx *EksInstanceGroupContext) GetOsFamily() string {
145145
instanceGroup = ctx.GetInstanceGroup()
146146
annotations = instanceGroup.GetAnnotations()
147147
)
148+
overrideAmazonLinuxFamily := strings.Trim(ctx.AmazonLinuxOsFamily, "\" ")
148149

149150
if v, exists := annotations[OsFamilyAnnotation]; exists {
150151
if common.ContainsEqualFold(AllowedOsFamilies, v) {
151152
return annotations[OsFamilyAnnotation]
152153
}
153154
ctx.Log.Info("used unsupported annotation value '%v=%v', will default to 'amazonlinux2', allowed values: %+v", OsFamilyAnnotation, v, AllowedOsFamilies)
154-
} else if common.ContainsEqualFold(AllowedOsFamilies, ctx.AmazonLinuxOsFamily) {
155-
return ctx.AmazonLinuxOsFamily
155+
} else if common.ContainsEqualFold(AllowedOsFamilies, overrideAmazonLinuxFamily) {
156+
return overrideAmazonLinuxFamily
156157
}
157158
return OsFamilyAmazonLinux2
158159
}

controllers/provisioners/eks/helpers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,12 +1288,13 @@ func (ctx *EksInstanceGroupContext) GetEksLatestAmi() (string, error) {
12881288
)
12891289
clusterVersion := state.GetClusterVersion()
12901290
annotations := instanceGroup.GetAnnotations()
1291+
overrideAmazonLinuxFamily := strings.Trim(ctx.AmazonLinuxOsFamily, "\" ")
12911292

12921293
var OSFamily string
12931294
if kubeprovider.HasAnnotation(annotations, OsFamilyAnnotation) {
12941295
OSFamily = annotations[OsFamilyAnnotation]
1295-
} else if ctx.AmazonLinuxOsFamily != "" {
1296-
OSFamily = ctx.AmazonLinuxOsFamily
1296+
} else if overrideAmazonLinuxFamily != "" {
1297+
OSFamily = overrideAmazonLinuxFamily
12971298
} else {
12981299
OSFamily = OsFamilyAmazonLinux2
12991300
}

0 commit comments

Comments
 (0)