Skip to content

Commit

Permalink
Filter allowed flags from kubelet args
Browse files Browse the repository at this point in the history
  • Loading branch information
Ole Markus With committed Dec 16, 2021
1 parent 32749e4 commit e0cff03
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkg/cloudprovider/aws/launchtemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
"github.com/aws/karpenter/pkg/apis/provisioning/v1alpha5"
"github.com/aws/karpenter/pkg/cloudprovider"
"github.com/aws/karpenter/pkg/cloudprovider/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/utils/functional"
Expand Down Expand Up @@ -250,16 +251,16 @@ exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
var nodeLabelArgs bytes.Buffer
if len(nodeLabels) > 0 {
nodeLabelArgs.WriteString("--node-labels=")
first := true
labelStrings := []string{}
// Must be in sorted order or else equivalent options won't
// hash the same
for _, k := range sortedKeys(nodeLabels) {
if !first {
nodeLabelArgs.WriteString(",")
if v1alpha5.AllowedLabelDomains.Has(k) {
continue
}
first = false
nodeLabelArgs.WriteString(fmt.Sprintf("%s=%v", k, nodeLabels[k]))
labelStrings = append(labelStrings, fmt.Sprintf("%s=%v", k, nodeLabels[k]))
}
nodeLabelArgs.WriteString(strings.Join(labelStrings, ","))
}
var nodeTaintsArgs bytes.Buffer
if len(constraints.Taints) > 0 {
Expand Down

0 comments on commit e0cff03

Please sign in to comment.