Skip to content

Provide node labels for webhook template #382

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

Merged
merged 5 commits into from
Mar 10, 2021
Merged

Provide node labels for webhook template #382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c349b3
Provide node labels for webhook template
imuqtadir Mar 5, 2021
25beb81
Move node label to interruptionEvent struct
imuqtadir Mar 9, 2021
ded4e5f
Fix indent
imuqtadir Mar 9, 2021
98e856c
Update node-termination-handler.go
imuqtadir Mar 10, 2021
658a069
Merge branch 'main' into node-labels-webhook
bwagner5 Mar 10, 2021
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
4 changes: 4 additions & 0 deletions cmd/node-termination-handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ func main() {

interruptionEventStore := interruptioneventstore.New(nthConfig)
nodeMetadata := imds.GetNodeMetadata()
nodeMetadata.NodeLabels, err = (*node).GetNodeLabels(nthConfig.NodeName)
if err != nil {
log.Warn().Err(err).Msg("Unable to fetch node labels")
}
// Populate the aws region if available from node metadata and not already explicitly configured
if nthConfig.AWSRegion == "" && nodeMetadata.Region != "" {
nthConfig.AWSRegion = nodeMetadata.Region
Expand Down
19 changes: 10 additions & 9 deletions pkg/ec2metadata/ec2metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,16 @@ type RebalanceRecommendation struct {

// NodeMetadata contains information that applies to every drain event
type NodeMetadata struct {
AccountId string `json:"accountId"`
InstanceID string `json:"instanceId"`
InstanceType string `json:"instanceType"`
PublicHostname string `json:"publicHostname"`
PublicIP string `json:"publicIp"`
LocalHostname string `json:"localHostname"`
LocalIP string `json:"privateIp"`
AvailabilityZone string `json:"availabilityZone"`
Region string `json:"region"`
AccountId string `json:"accountId"`
InstanceID string `json:"instanceId"`
InstanceType string `json:"instanceType"`
PublicHostname string `json:"publicHostname"`
PublicIP string `json:"publicIp"`
LocalHostname string `json:"localHostname"`
LocalIP string `json:"privateIp"`
AvailabilityZone string `json:"availabilityZone"`
Region string `json:"region"`
NodeLabels map[string]string `json:"nodeLabels"`
}

// New constructs an instance of the Service client
Expand Down
13 changes: 13 additions & 0 deletions pkg/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,19 @@ func (n Node) removeLabel(nodeName string, key string) error {
return nil
}

// GetNodeLabels will fetch node labels for a given nodeName
func (n Node) GetNodeLabels(nodeName string) (map[string]string, error) {
if n.nthConfig.DryRun {
log.Log().Str("node_name", nodeName).Msg("Node labels would have been fetched, but dry-run flag was set")
return nil, nil
}
node, err := n.fetchKubernetesNode(nodeName)
if err != nil {
return nil, err
}
return node.Labels, nil
}

// TaintSpotItn adds the spot termination notice taint onto a node
func (n Node) TaintSpotItn(nodeName string, eventID string) error {
if !n.nthConfig.TaintNode {
Expand Down