kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12240 from olemarkus/automated-cherry-pick-of-#12237-origin-release-1.22 

Automated cherry pick of #12237: Add instance state change notification to nth
This commit is contained in:
Kubernetes Prow Robot 2021-09-01 08:38:59 -07:00 committed by GitHub
parent 5b17b3640c bf09c432a9
commit cdb33dd4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kops/integration_test.go
View File

@ -1033,6 +1033,7 @@ func (i *integrationTest) runTestTerraformAWS(t *testing.T) {
"aws_cloudwatch_event_rule_" + i.clusterName + "-ASGLifecycle_event_pattern",
"aws_cloudwatch_event_rule_" + i.clusterName + "-RebalanceRecommendation_event_pattern",
"aws_cloudwatch_event_rule_" + i.clusterName + "-SpotInterruption_event_pattern",
"aws_cloudwatch_event_rule_" + i.clusterName + "-InstanceStateChange_event_pattern",
"aws_sqs_queue_" + strings.Replace(i.clusterName, ".", "-", -1) + "-nth_policy",
}...)
}

4
pkg/model/awsmodel/nodeterminationhandler.go
View File

@ -64,6 +64,10 @@ var (
name: "RebalanceRecommendation",
pattern: `{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}`,
},
{
name: "InstanceStateChange",
pattern: `{"source": ["aws.ec2"],"detail-type": ["EC2 Instance State-change Notification"]}`,
},
}
)

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -52,7 +52,7 @@ spec:
selector: null
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 9330666b0382e3ef54ce357319899e040f7b1477d63d7e4f1f592cb79eb3d395
manifestHash: 4197a26e91677e28e68617b12e8b2e9f2825d397578dcd7d8b6500e47a05c4c2
name: node-termination-handler.aws
selector:
k8s-addon: node-termination-handler.aws

8
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -90,7 +90,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -162,11 +162,13 @@ spec:
value: "false"
- name: LOG_LEVEL
value: info
- name: EMIT_KUBERNETES_EVENTS
value: "true"
- name: AWS_ROLE_ARN
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -52,7 +52,7 @@ spec:
selector: null
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 964641df31815a1c0740ac78a342fc422676509c05ec8f090368b3c4b16a8e13
manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf
name: node-termination-handler.aws
selector:
k8s-addon: node-termination-handler.aws

8
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -90,7 +90,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -162,7 +162,9 @@ spec:
value: "false"
- name: LOG_LEVEL
value: info
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

2
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -52,7 +52,7 @@ spec:
selector: null
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 964641df31815a1c0740ac78a342fc422676509c05ec8f090368b3c4b16a8e13
manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf
name: node-termination-handler.aws
selector:
k8s-addon: node-termination-handler.aws

8
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -90,7 +90,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -162,7 +162,9 @@ spec:
value: "false"
- name: LOG_LEVEL
value: info
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

20
tests/integration/update_cluster/nth_sqs_resources/cloudformation.json
View File

@ -989,6 +989,26 @@
]
}
},
"AWSEventsRulenthsqsresourcesexamplecomInstanceStateChange": {
"Type": "AWS::Events::Rule",
"Properties": {
"Name": "nthsqsresources.example.com-InstanceStateChange",
"EventPattern": {
"detail-type": [
"EC2 Instance State-change Notification"
],
"source": [
"aws.ec2"
]
},
"Targets": [
{
"Id": "1",
"Arn": "arn:aws:sqs:us-test-1:123456789012:nthsqsresources-example-com-nth"
}
]
}
},
"AWSEventsRulenthsqsresourcesexamplecomRebalanceRecommendation": {
"Type": "AWS::Events::Rule",
"Properties": {

1
tests/integration/update_cluster/nth_sqs_resources/data/aws_cloudwatch_event_rule_nthsqsresources.example.com-InstanceStateChange_event_pattern Normal file
View File

@ -0,0 +1 @@
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance State-change Notification"]}

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-bootstrap_content
View File

@ -41,7 +41,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 2fbd4c41bf3c8cfd8651b82cc9335431f0ad5931abb82b92dbb4fe713df2e1aa
manifestHash: c03c13e87cb8c6a7731fdbc08c9f99e1c960a9da71696fd33b781eca51de22dc
name: node-termination-handler.aws
selector:
k8s-addon: node-termination-handler.aws

10
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -90,7 +90,7 @@ metadata:
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/version: 1.13.0
app.kubernetes.io/version: 1.13.3
k8s-addon: node-termination-handler.aws
k8s-app: aws-node-termination-handler
name: aws-node-termination-handler
@ -168,7 +168,7 @@ spec:
- name: TAINT_NODE
value: "false"
- name: JSON_LOGGING
value: "false"
value: "true"
- name: LOG_LEVEL
value: info
- name: WEBHOOK_PROXY
@ -199,7 +199,9 @@ spec:
value: aws-node-termination-handler/managed
- name: WORKERS
value: "10"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
name: aws-node-termination-handler
resources:

15
tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf
View File

@ -229,6 +229,16 @@ resource "aws_cloudwatch_event_rule" "nthsqsresources-example-com-ASGLifecycle"
}
}
resource "aws_cloudwatch_event_rule" "nthsqsresources-example-com-InstanceStateChange" {
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_nthsqsresources.example.com-InstanceStateChange_event_pattern")
name = "nthsqsresources.example.com-InstanceStateChange"
tags = {
"KubernetesCluster" = "nthsqsresources.example.com"
"Name" = "nthsqsresources.example.com-InstanceStateChange"
"kubernetes.io/cluster/nthsqsresources.example.com" = "owned"
}
}
resource "aws_cloudwatch_event_rule" "nthsqsresources-example-com-RebalanceRecommendation" {
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_nthsqsresources.example.com-RebalanceRecommendation_event_pattern")
name = "nthsqsresources.example.com-RebalanceRecommendation"
@ -254,6 +264,11 @@ resource "aws_cloudwatch_event_target" "nthsqsresources-example-com-ASGLifecycle
rule = aws_cloudwatch_event_rule.nthsqsresources-example-com-ASGLifecycle.id
}
resource "aws_cloudwatch_event_target" "nthsqsresources-example-com-InstanceStateChange-Target" {
arn = "arn:aws:sqs:us-test-1:123456789012:nthsqsresources-example-com-nth"
rule = aws_cloudwatch_event_rule.nthsqsresources-example-com-InstanceStateChange.id
}
resource "aws_cloudwatch_event_target" "nthsqsresources-example-com-RebalanceRecommendation-Target" {
arn = "arn:aws:sqs:us-test-1:123456789012:nthsqsresources-example-com-nth"
rule = aws_cloudwatch_event_rule.nthsqsresources-example-com-RebalanceRecommendation.id

18
upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
View File

@ -1,5 +1,5 @@
{{ with .NodeTerminationHandler }}
# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.13.0/all-resources.yaml
# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.13.3/all-resources.yaml
---
# Source: aws-node-termination-handler/templates/serviceaccount.yaml
apiVersion: v1
@ -11,7 +11,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: aws-node-termination-handler
app.kubernetes.io/version: "1.13.0"
app.kubernetes.io/version: "1.13.3"
---
# Source: aws-node-termination-handler/templates/clusterrole.yaml
kind: ClusterRole
@ -78,7 +78,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: aws-node-termination-handler
app.kubernetes.io/version: "1.13.0"
app.kubernetes.io/version: "1.13.3"
spec:
replicas: 1
selector:
@ -117,7 +117,7 @@ spec:
fsGroup: 1000
containers:
- name: aws-node-termination-handler
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true
@ -167,7 +167,7 @@ spec:
- name: TAINT_NODE
value: "false"
- name: JSON_LOGGING
value: "false"
value: "true"
- name: LOG_LEVEL
value: "info"
- name: WEBHOOK_PROXY
@ -198,6 +198,8 @@ spec:
value: "{{ .ManagedASGTag }}"
- name: WORKERS
value: "10"
- name: EMIT_KUBERNETES_EVENTS
value: "true"
resources:
requests:
cpu: {{ .CPURequest }}
@ -220,7 +222,7 @@ metadata:
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: aws-node-termination-handler
app.kubernetes.io/version: "1.13.0"
app.kubernetes.io/version: "1.13.3"
spec:
updateStrategy:
rollingUpdate:
@ -264,7 +266,7 @@ spec:
dnsPolicy: "ClusterFirstWithHostNet"
containers:
- name: aws-node-termination-handler
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.0
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true
@ -313,6 +315,8 @@ spec:
value: "{{ .EnablePrometheusMetrics }}"
- name: LOG_LEVEL
value: "info"
- name: EMIT_KUBERNETES_EVENTS
value: "true"
resources:
requests:
cpu: {{ .CPURequest }}