Skip to content

Commit ab106cc

Browse files
rifelpetrifelpet
committed
./hack/update-expected.sh
1 parent a90fca8 commit ab106cc

68 files changed

Lines changed: 393 additions & 274 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/model/iam/tests/iam_builder_master_gossip.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"StringEquals": {
3939
"aws:RequestTag/KubernetesCluster": "iam-builder-test.k8s.local",
4040
"ec2:CreateAction": [
41-
"CreateVolume",
42-
"CreateSnapshot"
41+
"CopyVolumes",
42+
"CreateVolume"
4343
]
4444
}
4545
},
@@ -108,7 +108,6 @@
108108
"autoscaling:DescribeLaunchConfigurations",
109109
"autoscaling:DescribeScalingActivities",
110110
"autoscaling:DescribeTags",
111-
"ec2:DescribeAccountAttributes",
112111
"ec2:DescribeAvailabilityZones",
113112
"ec2:DescribeImages",
114113
"ec2:DescribeInstanceTopology",
@@ -120,6 +119,7 @@
120119
"ec2:DescribeSecurityGroups",
121120
"ec2:DescribeSubnets",
122121
"ec2:DescribeTags",
122+
"ec2:DescribeVolumeStatus",
123123
"ec2:DescribeVolumes",
124124
"ec2:DescribeVolumesModifications",
125125
"ec2:DescribeVpcs",
@@ -191,8 +191,8 @@
191191
},
192192
{
193193
"Action": [
194+
"ec2:CopyVolumes",
194195
"ec2:CreateSecurityGroup",
195-
"ec2:CreateSnapshot",
196196
"ec2:CreateVolume",
197197
"elasticloadbalancing:CreateListener",
198198
"elasticloadbalancing:CreateLoadBalancer",

‎pkg/model/iam/tests/iam_builder_master_gossip_ecr.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"StringEquals": {
3939
"aws:RequestTag/KubernetesCluster": "iam-builder-test.k8s.local",
4040
"ec2:CreateAction": [
41-
"CreateVolume",
42-
"CreateSnapshot"
41+
"CopyVolumes",
42+
"CreateVolume"
4343
]
4444
}
4545
},
@@ -108,7 +108,6 @@
108108
"autoscaling:DescribeLaunchConfigurations",
109109
"autoscaling:DescribeScalingActivities",
110110
"autoscaling:DescribeTags",
111-
"ec2:DescribeAccountAttributes",
112111
"ec2:DescribeAvailabilityZones",
113112
"ec2:DescribeImages",
114113
"ec2:DescribeInstanceTopology",
@@ -120,6 +119,7 @@
120119
"ec2:DescribeSecurityGroups",
121120
"ec2:DescribeSubnets",
122121
"ec2:DescribeTags",
122+
"ec2:DescribeVolumeStatus",
123123
"ec2:DescribeVolumes",
124124
"ec2:DescribeVolumesModifications",
125125
"ec2:DescribeVpcs",
@@ -198,8 +198,8 @@
198198
},
199199
{
200200
"Action": [
201+
"ec2:CopyVolumes",
201202
"ec2:CreateSecurityGroup",
202-
"ec2:CreateSnapshot",
203203
"ec2:CreateVolume",
204204
"elasticloadbalancing:CreateListener",
205205
"elasticloadbalancing:CreateLoadBalancer",

‎pkg/model/iam/tests/iam_builder_master_strict.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"StringEquals": {
3939
"aws:RequestTag/KubernetesCluster": "iam-builder-test.nonexistant",
4040
"ec2:CreateAction": [
41-
"CreateVolume",
42-
"CreateSnapshot"
41+
"CopyVolumes",
42+
"CreateVolume"
4343
]
4444
}
4545
},
@@ -108,7 +108,6 @@
108108
"autoscaling:DescribeLaunchConfigurations",
109109
"autoscaling:DescribeScalingActivities",
110110
"autoscaling:DescribeTags",
111-
"ec2:DescribeAccountAttributes",
112111
"ec2:DescribeAvailabilityZones",
113112
"ec2:DescribeImages",
114113
"ec2:DescribeInstanceTopology",
@@ -120,6 +119,7 @@
120119
"ec2:DescribeSecurityGroups",
121120
"ec2:DescribeSubnets",
122121
"ec2:DescribeTags",
122+
"ec2:DescribeVolumeStatus",
123123
"ec2:DescribeVolumes",
124124
"ec2:DescribeVolumesModifications",
125125
"ec2:DescribeVpcs",
@@ -191,8 +191,8 @@
191191
},
192192
{
193193
"Action": [
194+
"ec2:CopyVolumes",
194195
"ec2:CreateSecurityGroup",
195-
"ec2:CreateSnapshot",
196196
"ec2:CreateVolume",
197197
"elasticloadbalancing:CreateListener",
198198
"elasticloadbalancing:CreateLoadBalancer",

‎pkg/model/iam/tests/iam_builder_master_strict_ecr.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"StringEquals": {
3939
"aws:RequestTag/KubernetesCluster": "iam-builder-test.nonexistant",
4040
"ec2:CreateAction": [
41-
"CreateVolume",
42-
"CreateSnapshot"
41+
"CopyVolumes",
42+
"CreateVolume"
4343
]
4444
}
4545
},
@@ -108,7 +108,6 @@
108108
"autoscaling:DescribeLaunchConfigurations",
109109
"autoscaling:DescribeScalingActivities",
110110
"autoscaling:DescribeTags",
111-
"ec2:DescribeAccountAttributes",
112111
"ec2:DescribeAvailabilityZones",
113112
"ec2:DescribeImages",
114113
"ec2:DescribeInstanceTopology",
@@ -120,6 +119,7 @@
120119
"ec2:DescribeSecurityGroups",
121120
"ec2:DescribeSubnets",
122121
"ec2:DescribeTags",
122+
"ec2:DescribeVolumeStatus",
123123
"ec2:DescribeVolumes",
124124
"ec2:DescribeVolumesModifications",
125125
"ec2:DescribeVpcs",
@@ -198,8 +198,8 @@
198198
},
199199
{
200200
"Action": [
201+
"ec2:CopyVolumes",
201202
"ec2:CreateSecurityGroup",
202-
"ec2:CreateSnapshot",
203203
"ec2:CreateVolume",
204204
"elasticloadbalancing:CreateListener",
205205
"elasticloadbalancing:CreateLoadBalancer",

‎tests/integration/update_cluster/additionalobjects/data/aws_iam_role_policy_masters.additionalobjects.example.com_policy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"StringEquals": {
101101
"aws:RequestTag/KubernetesCluster": "additionalobjects.example.com",
102102
"ec2:CreateAction": [
103-
"CreateVolume",
104-
"CreateSnapshot"
103+
"CopyVolumes",
104+
"CreateVolume"
105105
]
106106
}
107107
},
@@ -170,7 +170,6 @@
170170
"autoscaling:DescribeLaunchConfigurations",
171171
"autoscaling:DescribeScalingActivities",
172172
"autoscaling:DescribeTags",
173-
"ec2:DescribeAccountAttributes",
174173
"ec2:DescribeAvailabilityZones",
175174
"ec2:DescribeImages",
176175
"ec2:DescribeInstanceTopology",
@@ -182,6 +181,7 @@
182181
"ec2:DescribeSecurityGroups",
183182
"ec2:DescribeSubnets",
184183
"ec2:DescribeTags",
184+
"ec2:DescribeVolumeStatus",
185185
"ec2:DescribeVolumes",
186186
"ec2:DescribeVolumesModifications",
187187
"ec2:DescribeVpcs",
@@ -261,8 +261,8 @@
261261
},
262262
{
263263
"Action": [
264+
"ec2:CopyVolumes",
264265
"ec2:CreateSecurityGroup",
265-
"ec2:CreateSnapshot",
266266
"ec2:CreateVolume",
267267
"elasticloadbalancing:CreateListener",
268268
"elasticloadbalancing:CreateLoadBalancer",

‎tests/integration/update_cluster/apiservernodes/data/aws_iam_role_policy_masters.minimal.example.com_policy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"StringEquals": {
101101
"aws:RequestTag/KubernetesCluster": "minimal.example.com",
102102
"ec2:CreateAction": [
103-
"CreateVolume",
104-
"CreateSnapshot"
103+
"CopyVolumes",
104+
"CreateVolume"
105105
]
106106
}
107107
},
@@ -170,7 +170,6 @@
170170
"autoscaling:DescribeLaunchConfigurations",
171171
"autoscaling:DescribeScalingActivities",
172172
"autoscaling:DescribeTags",
173-
"ec2:DescribeAccountAttributes",
174173
"ec2:DescribeAvailabilityZones",
175174
"ec2:DescribeImages",
176175
"ec2:DescribeInstanceTopology",
@@ -182,6 +181,7 @@
182181
"ec2:DescribeSecurityGroups",
183182
"ec2:DescribeSubnets",
184183
"ec2:DescribeTags",
184+
"ec2:DescribeVolumeStatus",
185185
"ec2:DescribeVolumes",
186186
"ec2:DescribeVolumesModifications",
187187
"ec2:DescribeVpcs",
@@ -254,8 +254,8 @@
254254
},
255255
{
256256
"Action": [
257+
"ec2:CopyVolumes",
257258
"ec2:CreateSecurityGroup",
258-
"ec2:CreateSnapshot",
259259
"ec2:CreateVolume",
260260
"elasticloadbalancing:CreateListener",
261261
"elasticloadbalancing:CreateLoadBalancer",

‎tests/integration/update_cluster/aws-lb-controller/data/aws_iam_role_policy_ebs-csi-controller-sa.kube-system.sa.minimal.example.com_policy‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"StringEquals": {
77
"aws:RequestTag/KubernetesCluster": "minimal.example.com",
88
"ec2:CreateAction": [
9-
"CreateVolume",
10-
"CreateSnapshot"
9+
"CopyVolumes",
10+
"CreateVolume"
1111
]
1212
}
1313
},
@@ -38,9 +38,11 @@
3838
},
3939
{
4040
"Action": [
41-
"ec2:DescribeAccountAttributes",
41+
"ec2:DescribeAvailabilityZones",
42+
"ec2:DescribeInstanceTypes",
4243
"ec2:DescribeInstances",
4344
"ec2:DescribeTags",
45+
"ec2:DescribeVolumeStatus",
4446
"ec2:DescribeVolumes",
4547
"ec2:DescribeVolumesModifications",
4648
"kms:CreateGrant",
@@ -58,7 +60,6 @@
5860
"ec2:AttachVolume",
5961
"ec2:DeleteVolume",
6062
"ec2:DetachVolume",
61-
"ec2:ModifyInstanceAttribute",
6263
"ec2:ModifyVolume"
6364
],
6465
"Condition": {
@@ -71,7 +72,7 @@
7172
},
7273
{
7374
"Action": [
74-
"ec2:CreateSnapshot",
75+
"ec2:CopyVolumes",
7576
"ec2:CreateVolume"
7677
],
7778
"Condition": {

‎tests/integration/update_cluster/bastionadditional_user-data/data/aws_iam_role_policy_masters.bastionuserdata.example.com_policy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"StringEquals": {
101101
"aws:RequestTag/KubernetesCluster": "bastionuserdata.example.com",
102102
"ec2:CreateAction": [
103-
"CreateVolume",
104-
"CreateSnapshot"
103+
"CopyVolumes",
104+
"CreateVolume"
105105
]
106106
}
107107
},
@@ -170,7 +170,6 @@
170170
"autoscaling:DescribeLaunchConfigurations",
171171
"autoscaling:DescribeScalingActivities",
172172
"autoscaling:DescribeTags",
173-
"ec2:DescribeAccountAttributes",
174173
"ec2:DescribeAvailabilityZones",
175174
"ec2:DescribeImages",
176175
"ec2:DescribeInstanceTopology",
@@ -182,6 +181,7 @@
182181
"ec2:DescribeSecurityGroups",
183182
"ec2:DescribeSubnets",
184183
"ec2:DescribeTags",
184+
"ec2:DescribeVolumeStatus",
185185
"ec2:DescribeVolumes",
186186
"ec2:DescribeVolumesModifications",
187187
"ec2:DescribeVpcs",
@@ -254,8 +254,8 @@
254254
},
255255
{
256256
"Action": [
257+
"ec2:CopyVolumes",
257258
"ec2:CreateSecurityGroup",
258-
"ec2:CreateSnapshot",
259259
"ec2:CreateVolume",
260260
"elasticloadbalancing:CreateListener",
261261
"elasticloadbalancing:CreateLoadBalancer",

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_iam_role_policy_masters.cas-priority-expander-custom.example.com_policy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"StringEquals": {
101101
"aws:RequestTag/KubernetesCluster": "cas-priority-expander-custom.example.com",
102102
"ec2:CreateAction": [
103-
"CreateVolume",
104-
"CreateSnapshot"
103+
"CopyVolumes",
104+
"CreateVolume"
105105
]
106106
}
107107
},
@@ -170,7 +170,6 @@
170170
"autoscaling:DescribeLaunchConfigurations",
171171
"autoscaling:DescribeScalingActivities",
172172
"autoscaling:DescribeTags",
173-
"ec2:DescribeAccountAttributes",
174173
"ec2:DescribeAvailabilityZones",
175174
"ec2:DescribeImages",
176175
"ec2:DescribeInstanceTopology",
@@ -182,6 +181,7 @@
182181
"ec2:DescribeSecurityGroups",
183182
"ec2:DescribeSubnets",
184183
"ec2:DescribeTags",
184+
"ec2:DescribeVolumeStatus",
185185
"ec2:DescribeVolumes",
186186
"ec2:DescribeVolumesModifications",
187187
"ec2:DescribeVpcs",
@@ -254,8 +254,8 @@
254254
},
255255
{
256256
"Action": [
257+
"ec2:CopyVolumes",
257258
"ec2:CreateSecurityGroup",
258-
"ec2:CreateSnapshot",
259259
"ec2:CreateVolume",
260260
"elasticloadbalancing:CreateListener",
261261
"elasticloadbalancing:CreateLoadBalancer",

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_iam_role_policy_masters.cas-priority-expander.example.com_policy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"StringEquals": {
101101
"aws:RequestTag/KubernetesCluster": "cas-priority-expander.example.com",
102102
"ec2:CreateAction": [
103-
"CreateVolume",
104-
"CreateSnapshot"
103+
"CopyVolumes",
104+
"CreateVolume"
105105
]
106106
}
107107
},
@@ -170,7 +170,6 @@
170170
"autoscaling:DescribeLaunchConfigurations",
171171
"autoscaling:DescribeScalingActivities",
172172
"autoscaling:DescribeTags",
173-
"ec2:DescribeAccountAttributes",
174173
"ec2:DescribeAvailabilityZones",
175174
"ec2:DescribeImages",
176175
"ec2:DescribeInstanceTopology",
@@ -182,6 +181,7 @@
182181
"ec2:DescribeSecurityGroups",
183182
"ec2:DescribeSubnets",
184183
"ec2:DescribeTags",
184+
"ec2:DescribeVolumeStatus",
185185
"ec2:DescribeVolumes",
186186
"ec2:DescribeVolumesModifications",
187187
"ec2:DescribeVpcs",
@@ -254,8 +254,8 @@
254254
},
255255
{
256256
"Action": [
257+
"ec2:CopyVolumes",
257258
"ec2:CreateSecurityGroup",
258-
"ec2:CreateSnapshot",
259259
"ec2:CreateVolume",
260260
"elasticloadbalancing:CreateListener",
261261
"elasticloadbalancing:CreateLoadBalancer",

0 commit comments

Comments
 (0)