Skip to content

Commit ec4e7fb

Browse files
Change node role policy ReadOnly -> PullOnly (support ECR pull-through cache) (#8386)
Change for default node IAM permissions to support ECR pull-through cache repositories, remove extra unnecessary permissions, and be in line with current AWS guidelines. Fixes issue #8318
1 parent c66077a commit ec4e7fb

Some content is hidden

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

42 files changed

+55
-55
lines changed

integration/tests/accessentries/testdata/node-role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"ManagedPolicyArns": [
2323
{
24-
"Fn::Sub": "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
24+
"Fn::Sub": "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
2525
},
2626
{
2727
"Fn::Sub": "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"

integration/tests/existing_vpc/cf-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Resources:
106106
- EC2
107107
Version: "2012-10-17"
108108
ManagedPolicyArns:
109-
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
109+
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly
110110
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy
111111
- !Sub arn:${AWS::Partition}:iam::aws:policy/AmazonEKS_CNI_Policy
112112
Path: /

integration/tests/unowned_cluster/cf-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Resources:
103103
- EC2
104104
Version: "2012-10-17"
105105
ManagedPolicyArns:
106-
- Fn::Sub: arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
106+
- Fn::Sub: arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly
107107
- Fn::Sub: arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy
108108
- Fn::Sub: arn:${AWS::Partition}:iam::aws:policy/AmazonEKS_CNI_Policy
109109
Path: "/"

pkg/actions/nodegroup/testdata/al2-force-false-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
},
203203
"ManagedPolicyArns": [
204204
{
205-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
205+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
206206
},
207207
{
208208
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/actions/nodegroup/testdata/al2-no-force-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
},
202202
"ManagedPolicyArns": [
203203
{
204-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
204+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
205205
},
206206
{
207207
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/actions/nodegroup/testdata/al2-updated-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
},
204204
"ManagedPolicyArns": [
205205
{
206-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
206+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
207207
},
208208
{
209209
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/actions/nodegroup/testdata/br-force-false-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
},
205205
"ManagedPolicyArns": [
206206
{
207-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
207+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
208208
},
209209
{
210210
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/actions/nodegroup/testdata/br-force-true-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
},
205205
"ManagedPolicyArns": [
206206
{
207-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
207+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
208208
},
209209
{
210210
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/actions/nodegroup/testdata/br-updated-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
},
205205
"ManagedPolicyArns": [
206206
{
207-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
207+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly"
208208
},
209209
{
210210
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"

pkg/cfn/builder/cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ var _ = Describe("Cluster Template Builder", func() {
680680
Expect(clusterTemplate.Resources).To(HaveKey("HybridNodesIRARole"))
681681
iraRole := clusterTemplate.Resources["HybridNodesIRARole"]
682682
Expect(iraRole.Properties.ManagedPolicyArns).To(ContainElement(map[string]interface{}{
683-
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly",
683+
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonEC2ContainerRegistryPullOnly",
684684
}))
685685
Expect(iraRole.Properties.ManagedPolicyArns).To(ContainElement(map[string]interface{}{
686686
"Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/AmazonSSMManagedInstanceCore",

0 commit comments

Comments
 (0)