Merge pull request #16009 from voriol/master

If specified, posts event data to URL upon instance interruption action.
kubernetes · Feb 13, 2024 · 5a3b1e2 · 5a3b1e2
2 parents b8603a2 + f1bc9a4
commit 5a3b1e2
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 0 deletions.
diff --git a/docs/addons.md b/docs/addons.md
@@ -280,6 +280,7 @@ spec:
     enableSQSTerminationDraining: true
     managedASGTag: "aws-node-termination-handler/managed"
     prometheusEnable: true
+    webhookURL: "https://hooks.slack.com/services/YOUR/SLACK/URL"
 ```
 
 ##### Queue Processor Mode

diff --git a/docs/releases/1.29-NOTES.md b/docs/releases/1.29-NOTES.md
@@ -32,6 +32,8 @@ have a security group attached. These security groups are used for security grou
 allowing incoming traffic to the NLBs as well as traffic between the NLBs and their target
 instances.
 
+* Posts event data to URL upon instance interruption action in aws-node-termination-handler with `WEBHOOK_URL`.
+
 ## GCP
 
 * As of Kubernetes version 1.29, credentials for private GCR/AR repositories will be handled by the out-of-tree credential provider. This is an additional binary that each instance downloads from the assets repository.

diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -5857,6 +5857,10 @@ spec:
                   version:
                     description: Version is the container image tag used.
                     type: string
+                  webhookURL:
+                    description: If specified, posts event data to URL upon instance
+                      interruption action.
+                    type: string
                 type: object
               nonMasqueradeCIDR:
                 description: MasterIPRange                 string `json:",omitempty"`

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -998,6 +998,9 @@ type NodeTerminationHandlerSpec struct {
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
+
+	// If specified, posts event data to URL upon instance interruption action.
+	WebhookURL *string `json:"webhookURL,omitempty"`
 }
 
 func (n *NodeTerminationHandlerSpec) IsQueueMode() bool {

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -1065,6 +1065,9 @@ type NodeTerminationHandlerSpec struct {
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
+
+	// If specified, posts event data to URL upon instance interruption action.
+	WebhookURL *string `json:"webhookURL,omitempty"`
 }
 
 // NodeProblemDetector determines the node problem detector configuration.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go
@@ -994,6 +994,9 @@ type NodeTerminationHandlerSpec struct {
 	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
+
+	// If specified, posts event data to URL upon instance interruption action.
+	WebhookURL *string `json:"webhookURL,omitempty"`
 }
 
 // NodeProblemDetector determines the node problem detector configuration.

diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
@@ -212,6 +212,10 @@ spec:
               value: "{{ DefaultQueueName }}"
             - name: WORKERS
               value: "10"
+            {{ if .WebhookURL }}
+            - name: WEBHOOK_URL
+              value: {{ .WebhookURL }}
+            {{ end }}
           ports:
           - name: liveness-probe
             protocol: TCP