Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCM-13175 | fix: optional work role check for AmazonEC2ContainerRegistryReadOnly optional #2736

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCM-13175 | fix: optional work role check for AmazonEC2ContainerRegistryReadOnly optional #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/aws/policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,13 +2175,15 @@ func (c *awsClient) GetOperatorRoleDefaultPolicy(roleName string) (string, error

func (c *awsClient) validateManagedPolicy(policies map[string]*cmv1.AWSSTSPolicy, policyKey string,
roleName string) error {
// EC2 policy is now returned from CS for all orgs. It is optional since it's only required
// to create zero egress clusters
if policyKey == WorkerEC2RegistryKey {
c.logger.Infof("Ignored check for policy key '%s' (only required for zero egress enabled clusters)", policyKey)
return nil
}

managedPolicyARN, err := GetManagedPolicyARN(policies, policyKey)
if err != nil {
// EC2 policy is only available to orgs for zero-egress feature toggle enabled
if policyKey == WorkerEC2RegistryKey {
c.logger.Infof("Ignored check for policy key '%s' (zero egress feature toggle is not enabled)", policyKey)
return nil
}
return err
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/aws/policies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ var _ = Describe("validateManagedPolicy", func() {
DescribeTable("validate ECR policy", func(
policies map[string]*cmv1.AWSSTSPolicy, policyKey, roleName, expectedErr string,
) {
mockIamAPI.EXPECT().ListAttachedRolePolicies(gomock.Any(), gomock.Any()).Return(nil, nil).Times(0)
err := client.validateManagedPolicy(policies, policyKey, roleName)
if expectedErr == "" {
Expect(err).To(BeNil())
Expand All @@ -856,6 +857,11 @@ var _ = Describe("validateManagedPolicy", func() {
Entry("succeeds if ECR policy does not exist", map[string]*cmv1.AWSSTSPolicy{
"sts_hcp_instance_worker_permission_policy": workerPolicy},
"sts_hcp_ec2_registry_permission_policy", "worker", ""),
Entry("succeeds if ECR policy exist but skips check if policy is attached",
map[string]*cmv1.AWSSTSPolicy{
"sts_hcp_instance_worker_permission_policy": workerPolicy,
"sts_hcp_ec2_registry_permission_policy": ec2ContainerPolicy},
"sts_hcp_ec2_registry_permission_policy", "worker", ""),
Entry("fails to find worker policy", map[string]*cmv1.AWSSTSPolicy{
"sts_hcp_ec2_registry_permission_policy": ec2ContainerPolicy},
"sts_hcp_instance_worker_permission_policy", "worker",
Expand Down