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

Add bucket policies to Kubernetes infra s3 buckets #8609

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+72 −5
Open

Add bucket policies to Kubernetes infra s3 buckets #8609

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
18 changes: 13 additions & 5 deletions cluster/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,6 @@ Resources:
- "{{.Cluster.ConfigItems.deployment_service_api_role_arn}}"
{{- end }}
- !Sub "arn:aws:iam::${AWS::AccountId}:role/cluster-lifecycle-manager-entrypoint"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Shibboleth-Administrator"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
DeploymentControllerRole:
Type: AWS::IAM::Role
Expand Down Expand Up @@ -2218,6 +2217,19 @@ Resources:
- !Sub
- "${BucketArn}/*"
- BucketArn: !GetAtt AuditTrailBucket.Arn
- Action: "s3:*"
Effect: Deny
Resource:
- !Sub "arn:aws:s3:::${AuditTrailBucket}/*"
- !Sub "arn:aws:s3:::${AuditTrailBucket}"
Principal: "*"
Condition:
ArnNotEquals:
aws:PrincipalArn:
- !GetAtt EmergencyAccessServiceIAMRole.Arn
- !GetAtt AudittrailAdapterIAMRole.Arn
- !Sub "arn:aws:iam::${AWS::AccountId}:role/cluster-lifecycle-manager-entrypoint"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"

{{- if .Cluster.ConfigItems.audittrail_root_account_role }}
# Central access
Expand Down Expand Up @@ -2420,7 +2432,6 @@ Resources:
Principal:
AWS:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/cluster-lifecycle-manager-entrypoint"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Shibboleth-Administrator"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
Action:
- "kms:*"
Expand Down Expand Up @@ -2458,7 +2469,6 @@ Resources:
Effect: "Allow"
Principal:
AWS:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Shibboleth-Administrator"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
Action:
- "kms:*"
Expand Down Expand Up @@ -2496,7 +2506,6 @@ Resources:
Principal:
AWS:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/cluster-lifecycle-manager-entrypoint"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Shibboleth-Administrator"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
Action:
- "kms:*"
Expand Down Expand Up @@ -2533,7 +2542,6 @@ Resources:
Principal:
AWS:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/cluster-lifecycle-manager-entrypoint"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Shibboleth-Administrator"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
Action:
- "kms:*"
Expand Down
10 changes: 10 additions & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,16 @@ etcd_scalyr_key: ""

etcd_ami: {{ amiID "zalando-ubuntu-etcd-production-v3.5.13-amd64-main-34" "861068367966"}}

# Enable/Disable bucket policy on the etcd bucket to limit access to the local
# cluster.
# This can be disabled in environments where multiple clusters share a single
# etcd instance e.g. e2e and dev environments.
{{if eq .Cluster.Environment "e2e"}}
etcd_backup_bucket_policy: "false"
{{else}}
etcd_backup_bucket_policy: "true"
{{end}}

cluster_dns: "coredns"
coredns_log_svc_names: "true"
coredns_log_forward: "false"
Expand Down
49 changes: 49 additions & 0 deletions cluster/etcd/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,55 @@ Resources:
Status: Enabled
VersioningConfiguration:
Status: Suspended
{{- if eq .Cluster.ConfigItems.etcd_backup_bucket_policy "true" }}
EtcdBackupBucketPolicy:
Type: AWS::S3::BucketPolicy
Properties:
Bucket: !Ref EtcdBackupBucket
PolicyDocument:
Statement:
# In-cluster access
- Action:
- s3:ListBucket
Effect: Allow
Principal:
AWS:
- "arn:aws:iam::${AWS::AccountId}:role/{{.Cluster.LocalID}}-etcd-backup"
Resource:
- !GetAtt EtcdBackupBucket.Arn
- Action:
- s3:PutObject
Effect: Allow
Principal:
AWS:
- "arn:aws:iam::${AWS::AccountId}:role/{{.Cluster.LocalID}}-etcd-backup"
Resource:
- !Sub
- "${BucketArn}/*"
- BucketArn: !GetAtt EtcdBackupBucket.Arn
- Action:
- s3:ListObjects
- s3:PutObject
Effect: Allow
Principal:
AWS:
- "arn:aws:iam::${AWS::AccountId}:role/{{.Cluster.LocalID}}-etcd-backup"
Resource:
- !Sub
- "${BucketArn}/*"
- BucketArn: !GetAtt EtcdBackupBucket.Arn
- Action: "s3:*"
Effect: Deny
Resource:
- !Sub "arn:aws:s3:::${EtcdBackupBucket}/*"
- !Sub "arn:aws:s3:::${EtcdBackupBucket}"
Principal: "*"
Condition:
ArnNotEquals:
aws:PrincipalArn:
- "arn:aws:iam::${AWS::AccountId}:role/{{.Cluster.LocalID}}-etcd-backup"
- !Sub "arn:aws:iam::${AWS::AccountId}:role/Administrator"
{{- end }}
EtcdRole:
Type: AWS::IAM::Role
Properties:
Expand Down