hack/update-expected.sh

kubernetes · Dec 12, 2022 · 65ed50a · 65ed50a
1 parent b7fa3cd
commit 65ed50a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 93 deletions.
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf
@@ -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

diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf
@@ -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

diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf
@@ -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

diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa25/kubernetes.tf
@@ -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

diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf b/tests/integration/update_cluster/many-addons-ccm-irsa26/kubernetes.tf
@@ -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

diff --git a/...egration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/...egration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
@@ -210,7 +210,7 @@ spec:
     amazonvpc: {}
   nodeTerminationHandler:
     cpuRequest: 50m
-    enableRebalanceDraining: false
+    enableRebalanceDraining: true
     enableRebalanceMonitoring: false
     enableScheduledEventDraining: true
     enableSpotInterruptionDraining: true

diff --git a/...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -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:

diff --git a/...ta/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/...ta/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
@@ -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

diff --git a/tests/integration/update_cluster/many-addons/kubernetes.tf b/tests/integration/update_cluster/many-addons/kubernetes.tf
@@ -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