Skip to content

Commit 91e9452

Browse files
author
Martin Linkhorst
committed
guard albc deployment by EKS and IPv6 condition
1 parent 5099261 commit 91e9452

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

cluster/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3222,7 +3222,7 @@ Resources:
32223222
PolicyName: root
32233223
RoleName: "{{.Cluster.LocalID}}-audittrail-adapter"
32243224
Type: 'AWS::IAM::Role'
3225-
# {{- if eq .Cluster.Provider "zalando-eks"}}
3225+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
32263226
AWSLoadBalancerControllerIAMRole:
32273227
Properties:
32283228
AssumeRolePolicyDocument: !Sub

cluster/config-defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ teapot_admission_controller_enable_write_protection_webhook: "true"
715715
teapot_admission_controller_prevent_write_operations: "true"
716716

717717
# inject default values into Services for ALBC on EKS
718-
{{ if eq .Cluster.Provider "zalando-eks" }}
718+
{{ if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
719719
teapot_admission_controller_inject_albc_defaults: "true"
720720
{{ else }}
721721
teapot_admission_controller_inject_albc_defaults: "false"

cluster/manifests/aws-load-balancer-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:

cluster/manifests/aws-load-balancer-controller/ingressclassparams.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:

cluster/manifests/aws-load-balancer-controller/rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:

cluster/manifests/aws-load-balancer-controller/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:

cluster/manifests/aws-load-balancer-controller/targetgroupbindings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:

cluster/manifests/aws-load-balancer-controller/vpa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if eq .Cluster.Provider "zalando-eks"}}
1+
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
22
apiVersion: autoscaling.k8s.io/v1
33
kind: VerticalPodAutoscaler
44
metadata:

0 commit comments

Comments
 (0)