mirror of https://github.com/kubernetes/kops.git
hack/update-expected.sh
This commit is contained in:
parent
55b46073b7
commit
9982efd8e3
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -341,16 +341,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -376,11 +366,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -341,16 +341,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -376,11 +366,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -326,16 +326,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -361,11 +351,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -326,16 +326,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -361,11 +351,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -326,16 +326,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -361,11 +351,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ spec:
|
|||
amazonvpc: {}
|
||||
nodeTerminationHandler:
|
||||
cpuRequest: 50m
|
||||
enableRebalanceDraining: false
|
||||
enableRebalanceDraining: true
|
||||
enableRebalanceMonitoring: false
|
||||
enableScheduledEventDraining: true
|
||||
enableSpotInterruptionDraining: true
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ spec:
|
|||
version: 9.99.0
|
||||
- id: k8s-1.11
|
||||
manifest: node-termination-handler.aws/k8s-1.11.yaml
|
||||
manifestHash: 031dd270cecb6247a363cebba3efb61ebb940315373f929a9ba2aee8e249ddfd
|
||||
manifestHash: 7cd05c5a73220c7db013f0c2e6322b23c989affed13804a221e98b82c11a60c6
|
||||
name: node-termination-handler.aws
|
||||
prune:
|
||||
kinds:
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ spec:
|
|||
- name: ENABLE_REBALANCE_MONITORING
|
||||
value: "false"
|
||||
- name: ENABLE_REBALANCE_DRAINING
|
||||
value: "false"
|
||||
value: "true"
|
||||
- name: ENABLE_SQS_TERMINATION_DRAINING
|
||||
value: "true"
|
||||
- name: QUEUE_URL
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance Rebalance Recommendation"]}
|
||||
|
|
@ -271,16 +271,6 @@ resource "aws_cloudwatch_event_rule" "minimal-example-com-InstanceStateChange" {
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-RebalanceRecommendation" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-RebalanceRecommendation_event_pattern")
|
||||
name = "minimal.example.com-RebalanceRecommendation"
|
||||
tags = {
|
||||
"KubernetesCluster" = "minimal.example.com"
|
||||
"Name" = "minimal.example.com-RebalanceRecommendation"
|
||||
"kubernetes.io/cluster/minimal.example.com" = "owned"
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_rule" "minimal-example-com-SpotInterruption" {
|
||||
event_pattern = file("${path.module}/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern")
|
||||
name = "minimal.example.com-SpotInterruption"
|
||||
|
|
@ -306,11 +296,6 @@ resource "aws_cloudwatch_event_target" "minimal-example-com-InstanceStateChange-
|
|||
rule = aws_cloudwatch_event_rule.minimal-example-com-InstanceStateChange.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-RebalanceRecommendation-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-RebalanceRecommendation.id
|
||||
}
|
||||
|
||||
resource "aws_cloudwatch_event_target" "minimal-example-com-SpotInterruption-Target" {
|
||||
arn = aws_sqs_queue.minimal-example-com-nth.arn
|
||||
rule = aws_cloudwatch_event_rule.minimal-example-com-SpotInterruption.id
|
||||
|
|
|
|||
Loading…
Reference in New Issue