mirror of https://github.com/kubernetes/kops.git
Fix ARN partition in SQS queue policy
This commit is contained in:
parent
8dc11bdba9
commit
0bd7348ad9
|
@ -38,7 +38,7 @@ const (
|
||||||
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
|
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
|
||||||
},
|
},
|
||||||
"Action": "sqs:SendMessage",
|
"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
|
DefaultMessageRetentionPeriod = 300
|
||||||
|
@ -116,6 +116,7 @@ func (b *NodeTerminationHandlerBuilder) configureASG(c *fi.ModelBuilderContext,
|
||||||
func (b *NodeTerminationHandlerBuilder) build(c *fi.ModelBuilderContext) error {
|
func (b *NodeTerminationHandlerBuilder) build(c *fi.ModelBuilderContext) error {
|
||||||
queueName := model.QueueNamePrefix(b.ClusterName()) + "-nth"
|
queueName := model.QueueNamePrefix(b.ClusterName()) + "-nth"
|
||||||
policy := strings.ReplaceAll(NTHTemplate, "{{ AWS_REGION }}", b.Region)
|
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, "{{ ACCOUNT_ID }}", b.AWSAccountID)
|
||||||
policy = strings.ReplaceAll(policy, "{{ SQS_QUEUE_NAME }}", queueName)
|
policy = strings.ReplaceAll(policy, "{{ SQS_QUEUE_NAME }}", queueName)
|
||||||
|
|
||||||
|
|
|
@ -1468,7 +1468,7 @@
|
||||||
"sqs.amazonaws.com"
|
"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"
|
"Version": "2012-10-17"
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
|
"Service": ["events.amazonaws.com", "sqs.amazonaws.com"]
|
||||||
},
|
},
|
||||||
"Action": "sqs:SendMessage",
|
"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"
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue