Fix hardcoded ARN partitions #12638
Merged
Fix hardcoded ARN partitions #12638
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
rifelpet
force-pushed
the
arn-partition
branch
from
8d14896 to
e0fea1f
Compare
|
/retest |
k8s-ci-robot
added
the
needs-rebase
rifelpet
force-pushed
the
arn-partition
branch
from
98e5e40 to
0bd7348
Compare
k8s-ci-robot
removed
the
needs-rebase
johngmyers
approved these changes
Oct 30, 2021
| @@ -32,7 +32,7 @@ var _ iam.Subject = &ServiceAccount{} | |||
| func (r *ServiceAccount) BuildAWSPolicy(b *iam.PolicyBuilder) (*iam.Policy, error) { | |||
| clusterName := b.Cluster.ObjectMeta.Name | |||
| p := iam.NewPolicy(clusterName) | |||
| iam.AddCCMPermissions(p, b.Cluster.Spec.Networking.Kubenet != nil) | |||
| iam.AddCCMPermissions(p, b.Partition, b.Cluster.Spec.Networking.Kubenet != nil) | |||
There was a problem hiding this comment.
Would it make sense to pass the partition into NewPolicy() instead of having to pass it to every Add*Permissions() call?
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: johngmyers The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
k8s-ci-robot
added a commit
that referenced
this pull request
Oct 30, 2021
…38-origin-release-1.22 Automated cherry pick of #12638: Fix hardcoded ARN partitions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IAMBuilder was hardcoding the partition in ARNs to
awsin IAM Policy documents for OIDC Providers, EBS Volumes, and EBS Snapshots. This fixes them to use the current partition (aws-testin integration tests). This also fixes a few ARNs generated in cloudmock and updates any ARNs referenced in cluster manifests as well.The end goal is that there are no ARNs with
awspartitions in any of the integration test inputs or outputs so they can be validated for support for alternative partitions via #12635.Fixes #12633