Skip to content

Commit

Permalink
Merge pull request #16856 from hakman/automated-cherry-pick-of-#16853-#…
Browse files Browse the repository at this point in the history 
…16855-upstream-release-1.30

Automated cherry pick of #16853: fix(cluster-autoscaler): add missing permission
#16855: correct hubble tls file names as mapped from secret
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Sep 25, 2024
2 parents 5158dde + 310a568 commit fbdeff1
Show file tree
Hide file tree
Showing 67 changed files with 139 additions and 10 deletions.
3 changes: 3 additions & 0 deletions pkg/model/iam/iam_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,10 @@ func AddClusterAutoscalerPermissions(p *Policy, useStaticInstanceList bool) {
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeScalingActivities",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions",
"ec2:GetInstanceTypesFromInstanceRequirements",
)
if !useStaticInstanceList {
p.unconditionalAction.Insert(
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_gossip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -121,6 +122,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_gossip_ecr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -121,6 +122,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:DescribeRepositories",
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_strict.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -121,6 +122,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_strict_ecr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -121,6 +122,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:DescribeRepositories",
Expand Down
2 changes: 2 additions & 0 deletions ...r/additionalobjects/data/aws_iam_role_policy_masters.additionalobjects.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:DescribeRepositories",
Expand Down
2 changes: 2 additions & 0 deletions ...update_cluster/apiservernodes/data/aws_iam_role_policy_masters.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...nadditional_user-data/data/aws_iam_role_policy_masters.bastionuserdata.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...r-custom/data/aws_iam_role_policy_masters.cas-priority-expander-custom.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...iority-expander/data/aws_iam_role_policy_masters.cas-priority-expander.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...ration/update_cluster/complex/data/aws_iam_role_policy_masters.complex.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...tion/update_cluster/compress/data/aws_iam_role_policy_masters.compress.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ..._cluster/containerd-custom/data/aws_iam_role_policy_masters.containerd.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions .../update_cluster/containerd/data/aws_iam_role_policy_masters.containerd.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions .../integration/update_cluster/digit/data/aws_iam_role_policy_masters.123.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...update_cluster/existing_sg/data/aws_iam_role_policy_masters.existingsg.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...n/update_cluster/external_dns/data/aws_iam_role_policy_masters.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions .../update_cluster/externallb/data/aws_iam_role_policy_masters.externallb.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...ter/externalpolicies/data/aws_iam_role_policy_masters.externalpolicies.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/update_cluster/ha/data/aws_iam_role_policy_masters.ha.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
2 changes: 2 additions & 0 deletions ...tegration/update_cluster/irsa/data/aws_iam_role_policy_masters.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"autoscaling:DescribeTags",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeLaunchTemplateVersions",
Expand All @@ -183,6 +184,7 @@
"ec2:DescribeVolumes",
"ec2:DescribeVolumesModifications",
"ec2:DescribeVpcs",
"ec2:GetInstanceTypesFromInstanceRequirements",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
4 changes: 3 additions & 1 deletion ...rsa/data/aws_iam_role_policy_cluster-autoscaler.kube-system.sa.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeScalingActivities",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions"
"ec2:DescribeLaunchTemplateVersions",
"ec2:GetInstanceTypesFromInstanceRequirements"
],
"Effect": "Allow",
"Resource": "*"
Expand Down
4 changes: 3 additions & 1 deletion ...a25/data/aws_iam_role_policy_cluster-autoscaler.kube-system.sa.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeScalingActivities",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions"
"ec2:DescribeLaunchTemplateVersions",
"ec2:GetInstanceTypesFromInstanceRequirements"
],
"Effect": "Allow",
"Resource": "*"
Expand Down
4 changes: 3 additions & 1 deletion ...a26/data/aws_iam_role_policy_cluster-autoscaler.kube-system.sa.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeScalingActivities",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions"
"ec2:DescribeLaunchTemplateVersions",
"ec2:GetInstanceTypesFromInstanceRequirements"
],
"Effect": "Allow",
"Resource": "*"
Expand Down
2 changes: 2 additions & 0 deletions ...pdate_cluster/many-addons-ccm/data/aws_iam_role_policy_masters.minimal.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
"ec2:DeleteNetworkInterface",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeInternetGateways",
Expand All @@ -238,6 +239,7 @@
"ec2:DescribeVpcPeeringConnections",
"ec2:DescribeVpcs",
"ec2:DetachNetworkInterface",
"ec2:GetInstanceTypesFromInstanceRequirements",
"ec2:ModifyNetworkInterfaceAttribute",
"ec2:UnassignPrivateIpAddresses",
"elasticloadbalancing:DescribeListenerCertificates",
Expand Down
2 changes: 2 additions & 0 deletions ...pdate_cluster/many-addons/data/aws_iam_role_policy_masters.many-addons.example.com_policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
"ec2:DeleteNetworkInterface",
"ec2:DescribeAccountAttributes",
"ec2:DescribeAvailabilityZones",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstances",
"ec2:DescribeInternetGateways",
Expand All @@ -238,6 +239,7 @@
"ec2:DescribeVpcPeeringConnections",
"ec2:DescribeVpcs",
"ec2:DetachNetworkInterface",
"ec2:GetInstanceTypesFromInstanceRequirements",
"ec2:ModifyNetworkInterfaceAttribute",
"ec2:UnassignPrivateIpAddresses",
"elasticloadbalancing:DescribeListenerCertificates",
Expand Down
Loading

0 comments on commit fbdeff1

Please sign in to comment.