Skip to content

Commit 3a496f6

Browse files
rifelpetrifelpet
committed
./hack/update-expected.sh
1 parent c97d4e6 commit 3a496f6

File tree

4 files changed

+128
-64
lines changed

4 files changed

+128
-64
lines changed

‎tests/integration/update_cluster/aws-lb-controller/data/aws_iam_role_policy_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
{
22
"Statement": [
3+
{
4+
"Action": [
5+
"elasticloadbalancing:AddListenerCertificates",
6+
"elasticloadbalancing:AddTags",
7+
"elasticloadbalancing:DeleteListener",
8+
"elasticloadbalancing:DeleteLoadBalancer",
9+
"elasticloadbalancing:DeleteRule",
10+
"elasticloadbalancing:DeleteTargetGroup",
11+
"elasticloadbalancing:DeregisterTargets",
12+
"elasticloadbalancing:ModifyCapacityReservation",
13+
"elasticloadbalancing:ModifyListener",
14+
"elasticloadbalancing:ModifyListenerAttributes",
15+
"elasticloadbalancing:ModifyLoadBalancerAttributes",
16+
"elasticloadbalancing:ModifyRule",
17+
"elasticloadbalancing:ModifyTargetGroup",
18+
"elasticloadbalancing:ModifyTargetGroupAttributes",
19+
"elasticloadbalancing:RegisterTargets",
20+
"elasticloadbalancing:RemoveListenerCertificates",
21+
"elasticloadbalancing:RemoveTags",
22+
"elasticloadbalancing:SetIpAddressType",
23+
"elasticloadbalancing:SetSecurityGroups",
24+
"elasticloadbalancing:SetSubnets"
25+
],
26+
"Condition": {
27+
"StringEquals": {
28+
"aws:ResourceTag/elbv2.k8s.aws/cluster": "minimal.example.com"
29+
}
30+
},
31+
"Effect": "Allow",
32+
"Resource": "*"
33+
},
334
{
435
"Action": [
536
"elasticloadbalancing:CreateListener",
@@ -108,27 +139,7 @@
108139
"Action": [
109140
"ec2:AuthorizeSecurityGroupIngress",
110141
"ec2:DeleteSecurityGroup",
111-
"ec2:RevokeSecurityGroupIngress",
112-
"elasticloadbalancing:AddListenerCertificates",
113-
"elasticloadbalancing:AddTags",
114-
"elasticloadbalancing:DeleteListener",
115-
"elasticloadbalancing:DeleteLoadBalancer",
116-
"elasticloadbalancing:DeleteRule",
117-
"elasticloadbalancing:DeleteTargetGroup",
118-
"elasticloadbalancing:DeregisterTargets",
119-
"elasticloadbalancing:ModifyCapacityReservation",
120-
"elasticloadbalancing:ModifyListener",
121-
"elasticloadbalancing:ModifyListenerAttributes",
122-
"elasticloadbalancing:ModifyLoadBalancerAttributes",
123-
"elasticloadbalancing:ModifyRule",
124-
"elasticloadbalancing:ModifyTargetGroup",
125-
"elasticloadbalancing:ModifyTargetGroupAttributes",
126-
"elasticloadbalancing:RegisterTargets",
127-
"elasticloadbalancing:RemoveListenerCertificates",
128-
"elasticloadbalancing:RemoveTags",
129-
"elasticloadbalancing:SetIpAddressType",
130-
"elasticloadbalancing:SetSecurityGroups",
131-
"elasticloadbalancing:SetSubnets"
142+
"ec2:RevokeSecurityGroupIngress"
132143
],
133144
"Condition": {
134145
"StringEquals": {

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_iam_role_policy_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
{
22
"Statement": [
3+
{
4+
"Action": [
5+
"elasticloadbalancing:AddListenerCertificates",
6+
"elasticloadbalancing:AddTags",
7+
"elasticloadbalancing:DeleteListener",
8+
"elasticloadbalancing:DeleteLoadBalancer",
9+
"elasticloadbalancing:DeleteRule",
10+
"elasticloadbalancing:DeleteTargetGroup",
11+
"elasticloadbalancing:DeregisterTargets",
12+
"elasticloadbalancing:ModifyCapacityReservation",
13+
"elasticloadbalancing:ModifyListener",
14+
"elasticloadbalancing:ModifyListenerAttributes",
15+
"elasticloadbalancing:ModifyLoadBalancerAttributes",
16+
"elasticloadbalancing:ModifyRule",
17+
"elasticloadbalancing:ModifyTargetGroup",
18+
"elasticloadbalancing:ModifyTargetGroupAttributes",
19+
"elasticloadbalancing:RegisterTargets",
20+
"elasticloadbalancing:RemoveListenerCertificates",
21+
"elasticloadbalancing:RemoveTags",
22+
"elasticloadbalancing:SetIpAddressType",
23+
"elasticloadbalancing:SetSecurityGroups",
24+
"elasticloadbalancing:SetSubnets"
25+
],
26+
"Condition": {
27+
"StringEquals": {
28+
"aws:ResourceTag/elbv2.k8s.aws/cluster": "minimal.example.com"
29+
}
30+
},
31+
"Effect": "Allow",
32+
"Resource": "*"
33+
},
334
{
435
"Action": [
536
"elasticloadbalancing:CreateListener",
@@ -108,27 +139,7 @@
108139
"Action": [
109140
"ec2:AuthorizeSecurityGroupIngress",
110141
"ec2:DeleteSecurityGroup",
111-
"ec2:RevokeSecurityGroupIngress",
112-
"elasticloadbalancing:AddListenerCertificates",
113-
"elasticloadbalancing:AddTags",
114-
"elasticloadbalancing:DeleteListener",
115-
"elasticloadbalancing:DeleteLoadBalancer",
116-
"elasticloadbalancing:DeleteRule",
117-
"elasticloadbalancing:DeleteTargetGroup",
118-
"elasticloadbalancing:DeregisterTargets",
119-
"elasticloadbalancing:ModifyCapacityReservation",
120-
"elasticloadbalancing:ModifyListener",
121-
"elasticloadbalancing:ModifyListenerAttributes",
122-
"elasticloadbalancing:ModifyLoadBalancerAttributes",
123-
"elasticloadbalancing:ModifyRule",
124-
"elasticloadbalancing:ModifyTargetGroup",
125-
"elasticloadbalancing:ModifyTargetGroupAttributes",
126-
"elasticloadbalancing:RegisterTargets",
127-
"elasticloadbalancing:RemoveListenerCertificates",
128-
"elasticloadbalancing:RemoveTags",
129-
"elasticloadbalancing:SetIpAddressType",
130-
"elasticloadbalancing:SetSecurityGroups",
131-
"elasticloadbalancing:SetSubnets"
142+
"ec2:RevokeSecurityGroupIngress"
132143
],
133144
"Condition": {
134145
"StringEquals": {

‎tests/integration/update_cluster/many-addons-ccm/data/aws_iam_role_policy_masters.minimal.example.com_policy‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,37 @@
210210
"arn:aws-test:ec2:*:*:security-group/*"
211211
]
212212
},
213+
{
214+
"Action": [
215+
"elasticloadbalancing:AddListenerCertificates",
216+
"elasticloadbalancing:AddTags",
217+
"elasticloadbalancing:DeleteListener",
218+
"elasticloadbalancing:DeleteLoadBalancer",
219+
"elasticloadbalancing:DeleteRule",
220+
"elasticloadbalancing:DeleteTargetGroup",
221+
"elasticloadbalancing:DeregisterTargets",
222+
"elasticloadbalancing:ModifyCapacityReservation",
223+
"elasticloadbalancing:ModifyListener",
224+
"elasticloadbalancing:ModifyListenerAttributes",
225+
"elasticloadbalancing:ModifyLoadBalancerAttributes",
226+
"elasticloadbalancing:ModifyRule",
227+
"elasticloadbalancing:ModifyTargetGroup",
228+
"elasticloadbalancing:ModifyTargetGroupAttributes",
229+
"elasticloadbalancing:RegisterTargets",
230+
"elasticloadbalancing:RemoveListenerCertificates",
231+
"elasticloadbalancing:RemoveTags",
232+
"elasticloadbalancing:SetIpAddressType",
233+
"elasticloadbalancing:SetSecurityGroups",
234+
"elasticloadbalancing:SetSubnets"
235+
],
236+
"Condition": {
237+
"StringEquals": {
238+
"aws:ResourceTag/elbv2.k8s.aws/cluster": "minimal.example.com"
239+
}
240+
},
241+
"Effect": "Allow",
242+
"Resource": "*"
243+
},
213244
{
214245
"Action": [
215246
"elasticloadbalancing:CreateListener",
@@ -376,7 +407,6 @@
376407
"ec2:ModifyInstanceAttribute",
377408
"ec2:ModifyVolume",
378409
"ec2:RevokeSecurityGroupIngress",
379-
"elasticloadbalancing:AddListenerCertificates",
380410
"elasticloadbalancing:AddTags",
381411
"elasticloadbalancing:ApplySecurityGroupsToLoadBalancer",
382412
"elasticloadbalancing:AttachLoadBalancerToSubnets",
@@ -386,27 +416,18 @@
386416
"elasticloadbalancing:DeleteListener",
387417
"elasticloadbalancing:DeleteLoadBalancer",
388418
"elasticloadbalancing:DeleteLoadBalancerListeners",
389-
"elasticloadbalancing:DeleteRule",
390419
"elasticloadbalancing:DeleteTargetGroup",
391420
"elasticloadbalancing:DeregisterInstancesFromLoadBalancer",
392421
"elasticloadbalancing:DeregisterTargets",
393422
"elasticloadbalancing:DetachLoadBalancerFromSubnets",
394-
"elasticloadbalancing:ModifyCapacityReservation",
395423
"elasticloadbalancing:ModifyListener",
396-
"elasticloadbalancing:ModifyListenerAttributes",
397424
"elasticloadbalancing:ModifyLoadBalancerAttributes",
398-
"elasticloadbalancing:ModifyRule",
399425
"elasticloadbalancing:ModifyTargetGroup",
400426
"elasticloadbalancing:ModifyTargetGroupAttributes",
401427
"elasticloadbalancing:RegisterInstancesWithLoadBalancer",
402428
"elasticloadbalancing:RegisterTargets",
403-
"elasticloadbalancing:RemoveListenerCertificates",
404-
"elasticloadbalancing:RemoveTags",
405-
"elasticloadbalancing:SetIpAddressType",
406429
"elasticloadbalancing:SetLoadBalancerPoliciesForBackendServer",
407-
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
408-
"elasticloadbalancing:SetSecurityGroups",
409-
"elasticloadbalancing:SetSubnets"
430+
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener"
410431
],
411432
"Condition": {
412433
"StringEquals": {

‎tests/integration/update_cluster/many-addons/data/aws_iam_role_policy_masters.many-addons.example.com_policy‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,37 @@
210210
"arn:aws-test:ec2:*:*:security-group/*"
211211
]
212212
},
213+
{
214+
"Action": [
215+
"elasticloadbalancing:AddListenerCertificates",
216+
"elasticloadbalancing:AddTags",
217+
"elasticloadbalancing:DeleteListener",
218+
"elasticloadbalancing:DeleteLoadBalancer",
219+
"elasticloadbalancing:DeleteRule",
220+
"elasticloadbalancing:DeleteTargetGroup",
221+
"elasticloadbalancing:DeregisterTargets",
222+
"elasticloadbalancing:ModifyCapacityReservation",
223+
"elasticloadbalancing:ModifyListener",
224+
"elasticloadbalancing:ModifyListenerAttributes",
225+
"elasticloadbalancing:ModifyLoadBalancerAttributes",
226+
"elasticloadbalancing:ModifyRule",
227+
"elasticloadbalancing:ModifyTargetGroup",
228+
"elasticloadbalancing:ModifyTargetGroupAttributes",
229+
"elasticloadbalancing:RegisterTargets",
230+
"elasticloadbalancing:RemoveListenerCertificates",
231+
"elasticloadbalancing:RemoveTags",
232+
"elasticloadbalancing:SetIpAddressType",
233+
"elasticloadbalancing:SetSecurityGroups",
234+
"elasticloadbalancing:SetSubnets"
235+
],
236+
"Condition": {
237+
"StringEquals": {
238+
"aws:ResourceTag/elbv2.k8s.aws/cluster": "many-addons.example.com"
239+
}
240+
},
241+
"Effect": "Allow",
242+
"Resource": "*"
243+
},
213244
{
214245
"Action": [
215246
"elasticloadbalancing:CreateListener",
@@ -376,7 +407,6 @@
376407
"ec2:ModifyInstanceAttribute",
377408
"ec2:ModifyVolume",
378409
"ec2:RevokeSecurityGroupIngress",
379-
"elasticloadbalancing:AddListenerCertificates",
380410
"elasticloadbalancing:AddTags",
381411
"elasticloadbalancing:ApplySecurityGroupsToLoadBalancer",
382412
"elasticloadbalancing:AttachLoadBalancerToSubnets",
@@ -386,27 +416,18 @@
386416
"elasticloadbalancing:DeleteListener",
387417
"elasticloadbalancing:DeleteLoadBalancer",
388418
"elasticloadbalancing:DeleteLoadBalancerListeners",
389-
"elasticloadbalancing:DeleteRule",
390419
"elasticloadbalancing:DeleteTargetGroup",
391420
"elasticloadbalancing:DeregisterInstancesFromLoadBalancer",
392421
"elasticloadbalancing:DeregisterTargets",
393422
"elasticloadbalancing:DetachLoadBalancerFromSubnets",
394-
"elasticloadbalancing:ModifyCapacityReservation",
395423
"elasticloadbalancing:ModifyListener",
396-
"elasticloadbalancing:ModifyListenerAttributes",
397424
"elasticloadbalancing:ModifyLoadBalancerAttributes",
398-
"elasticloadbalancing:ModifyRule",
399425
"elasticloadbalancing:ModifyTargetGroup",
400426
"elasticloadbalancing:ModifyTargetGroupAttributes",
401427
"elasticloadbalancing:RegisterInstancesWithLoadBalancer",
402428
"elasticloadbalancing:RegisterTargets",
403-
"elasticloadbalancing:RemoveListenerCertificates",
404-
"elasticloadbalancing:RemoveTags",
405-
"elasticloadbalancing:SetIpAddressType",
406429
"elasticloadbalancing:SetLoadBalancerPoliciesForBackendServer",
407-
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
408-
"elasticloadbalancing:SetSecurityGroups",
409-
"elasticloadbalancing:SetSubnets"
430+
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener"
410431
],
411432
"Condition": {
412433
"StringEquals": {

0 commit comments

Comments
 (0)