Merge pull request #5888 from zalando-incubator/dev-to-kube-1.23

dev to kube-1.23
zalando-incubator · Apr 3, 2023 · 779895f · 779895f
2 parents a384a68 + b330bd8
commit 779895f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/cluster/cluster.yaml b/cluster/cluster.yaml
@@ -1947,11 +1947,13 @@ Resources:
       Description: "AWS service role for application autoscaling DynamoDB"
     Type: "AWS::IAM::ServiceLinkedRole"
 {{- end }}
+{{- if eq .Cluster.ConfigItems.quotas_service_link_enabled "true" }}
   ServiceLinkedRoleServiceQuotas:
     Properties:
       AWSServiceName: "servicequotas.amazonaws.com"
       Description: "AWS service role for Service Quotas"
     Type: "AWS::IAM::ServiceLinkedRole"
+{{- end }}
   RemoteFilesEncryptionKey:
     Type: "AWS::KMS::Key"
     Properties:

diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -548,6 +548,11 @@ etcd_scalyr_key: ""
 etcd_ami: {{ amiID "zalando-ubuntu-etcd-production-v3.4.16-amd64-main-10" "861068367966"}}
 
 dynamodb_service_link_enabled: "false"
+{{if eq .Cluster.Environment "e2e"}}
+quotas_service_link_enabled: "false"
+{{else}}
+quotas_service_link_enabled: "true"
+{{end}}
 
 cluster_dns: "coredns"
 coredns_log_svc_names: "true"