Skip to content

Commit 15a2d14

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#5543 from AndiDog/cancel-instance-refresh
✨ Cancel instance refresh on any relevant change to ASG instead of blocking until previous one is finished (which may have led to failing nodes due to outdated join token)
2 parents c3838a1 + baf3527 commit 15a2d14

26 files changed

+236
-108
lines changed

‎cmd/clusterawsadm/cloudformation/bootstrap/cluster_api_controller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
199199
"arn:*:autoscaling:*:*:autoScalingGroup:*:autoScalingGroupName/*",
200200
},
201201
Action: iamv1.Actions{
202+
"autoscaling:CancelInstanceRefresh",
202203
"autoscaling:CreateAutoScalingGroup",
203204
"autoscaling:UpdateAutoScalingGroup",
204205
"autoscaling:CreateOrUpdateTags",

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/customsuffix.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/default.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_all_secret_backends.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ Resources:
261261
Resource:
262262
- '*'
263263
- Action:
264+
- autoscaling:CancelInstanceRefresh
264265
- autoscaling:CreateAutoScalingGroup
265266
- autoscaling:UpdateAutoScalingGroup
266267
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_allow_assume_role.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_bootstrap_user.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ Resources:
261261
Resource:
262262
- '*'
263263
- Action:
264+
- autoscaling:CancelInstanceRefresh
264265
- autoscaling:CreateAutoScalingGroup
265266
- autoscaling:UpdateAutoScalingGroup
266267
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_custom_bootstrap_user.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ Resources:
261261
Resource:
262262
- '*'
263263
- Action:
264+
- autoscaling:CancelInstanceRefresh
264265
- autoscaling:CreateAutoScalingGroup
265266
- autoscaling:UpdateAutoScalingGroup
266267
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_different_instance_profiles.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_console.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_default_roles.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Resources:
255255
Resource:
256256
- '*'
257257
- Action:
258+
- autoscaling:CancelInstanceRefresh
258259
- autoscaling:CreateAutoScalingGroup
259260
- autoscaling:UpdateAutoScalingGroup
260261
- autoscaling:CreateOrUpdateTags

0 commit comments

Comments
 (0)