kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ARN partition in SQS queue policy

This commit is contained in:
Peter Rifel 2021-10-29 17:46:33 -05:00
parent 8dc11bdba9
commit 0bd7348ad9
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/model/awsmodel/nodeterminationhandler.go
View File

@ -38,7 +38,7 @@ const (
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
},
"Action": "sqs:SendMessage",
"Resource": "arn:aws:sqs:{{ AWS_REGION }}:{{ ACCOUNT_ID }}:{{ SQS_QUEUE_NAME }}"
"Resource": "arn:{{ AWS_PARTITION }}:sqs:{{ AWS_REGION }}:{{ ACCOUNT_ID }}:{{ SQS_QUEUE_NAME }}"
}]
}`
DefaultMessageRetentionPeriod = 300
@ -116,6 +116,7 @@ func (b *NodeTerminationHandlerBuilder) configureASG(c *fi.ModelBuilderContext,
func (b *NodeTerminationHandlerBuilder) build(c *fi.ModelBuilderContext) error {
queueName := model.QueueNamePrefix(b.ClusterName()) + "-nth"
policy := strings.ReplaceAll(NTHTemplate, "{{ AWS_REGION }}", b.Region)
policy = strings.ReplaceAll(policy, "{{ AWS_PARTITION }}", b.AWSPartition)
policy = strings.ReplaceAll(policy, "{{ ACCOUNT_ID }}", b.AWSAccountID)
policy = strings.ReplaceAll(policy, "{{ SQS_QUEUE_NAME }}", queueName)

2
tests/integration/update_cluster/nth_sqs_resources/cloudformation.json
View File

@ -1468,7 +1468,7 @@
"sqs.amazonaws.com"
]
},
"Resource": "arn:aws:sqs:us-test-1:123456789012:nthsqsresources-longclustername-example-com-nth"
"Resource": "arn:aws-test:sqs:us-test-1:123456789012:nthsqsresources-longclustername-example-com-nth"
}
],
"Version": "2012-10-17"

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_sqs_queue_nthsqsresources-longclustername-example-com-nth_policy
View File

@ -6,6 +6,6 @@
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
},
"Action": "sqs:SendMessage",
"Resource": "arn:aws:sqs:us-test-1:123456789012:nthsqsresources-longclustername-example-com-nth"
"Resource": "arn:aws-test:sqs:us-test-1:123456789012:nthsqsresources-longclustername-example-com-nth"
}]
}