diff --git a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template index d4e29b66ca..6dfb007f5a 100644 --- a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template +++ b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template @@ -635,7 +635,7 @@ spec: values: ["spot"] - key: kubernetes.io/arch operator: In - values: ["{{ SupportedArchitecture $spec.Image }}"] + values: ["{{ ArchitectureOfAMI $spec.Image }}"] - key: "node.kubernetes.io/instance-type" operator: In values: diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index add1d3d7f8..b26d0e3c8d 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -281,7 +281,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS dest["EnableSQSTerminationDraining"] = func() bool { return *cluster.Spec.NodeTerminationHandler.EnableSQSTerminationDraining } } - dest["SupportedArchitecture"] = tf.SupportedArchitecture + dest["ArchitectureOfAMI"] = tf.architectureOfAMI dest["ParseTaint"] = parseTaint @@ -741,7 +741,7 @@ func (tf *TemplateFunctions) GetNodeInstanceGroups() map[string]kops.InstanceGro return nodegroups } -func (tf *TemplateFunctions) SupportedArchitecture(amiID string) string { +func (tf *TemplateFunctions) architectureOfAMI(amiID string) string { image, _ := tf.cloud.(awsup.AWSCloud).ResolveImage(amiID) switch *image.Architecture { case "x86_64":