trim quotes from override al os family

Signed-off-by: eramirez8 <[email protected]>

Author: eramirez8

controllers/provisioners/eks/eks.go

@@ -17,17 +17,18 @@ package eks
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/go-logr/logr"
-
 	"github.com/keikoproj/instance-manager/api/instancemgr/v1alpha1"
 	"github.com/keikoproj/instance-manager/controllers/common"
 	awsprovider "github.com/keikoproj/instance-manager/controllers/providers/aws"
 	kubeprovider "github.com/keikoproj/instance-manager/controllers/providers/kubernetes"
 	"github.com/keikoproj/instance-manager/controllers/provisioners"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -145,14 +146,16 @@ func (ctx *EksInstanceGroupContext) GetOsFamily() string {
 		instanceGroup = ctx.GetInstanceGroup()
 		annotations   = instanceGroup.GetAnnotations()
 	)
+	overrideAmazonLinuxFamily := strings.Trim(ctx.AmazonLinuxOsFamily, "\" ")
 
 	if v, exists := annotations[OsFamilyAnnotation]; exists {
 		if common.ContainsEqualFold(AllowedOsFamilies, v) {
+			log.Infof("HERE 1")
 			return annotations[OsFamilyAnnotation]
 		}
 		ctx.Log.Info("used unsupported annotation value '%v=%v', will default to 'amazonlinux2', allowed values: %+v", OsFamilyAnnotation, v, AllowedOsFamilies)
-	} else if common.ContainsEqualFold(AllowedOsFamilies, ctx.AmazonLinuxOsFamily) {
-		return ctx.AmazonLinuxOsFamily
+	} else if common.ContainsEqualFold(AllowedOsFamilies, overrideAmazonLinuxFamily) {
+		return overrideAmazonLinuxFamily
 	}
 	return OsFamilyAmazonLinux2
 }

controllers/provisioners/eks/helpers.go

@@ -1288,12 +1288,13 @@ func (ctx *EksInstanceGroupContext) GetEksLatestAmi() (string, error) {
 	)
 	clusterVersion := state.GetClusterVersion()
 	annotations := instanceGroup.GetAnnotations()
+	overrideAmazonLinuxFamily := strings.Trim(ctx.AmazonLinuxOsFamily, "\" ")
 
 	var OSFamily string
 	if kubeprovider.HasAnnotation(annotations, OsFamilyAnnotation) {
 		OSFamily = annotations[OsFamilyAnnotation]
-	} else if ctx.AmazonLinuxOsFamily != "" {
-		OSFamily = ctx.AmazonLinuxOsFamily
+	} else if overrideAmazonLinuxFamily != "" {
+		OSFamily = overrideAmazonLinuxFamily
 	} else {
 		OSFamily = OsFamilyAmazonLinux2
 	}