Use Cluster.Provider instead of config item

Signed-off-by: Rodrigo Reis <[email protected]>
zalando-incubator · Jun 24, 2024 · 891cbaa · 891cbaa
1 parent 092af3c
commit 891cbaa
Show file tree

Hide file tree

Showing 46 changed files with 111 additions and 111 deletions.
diff --git a/cluster/cluster.yaml b/cluster/cluster.yaml
@@ -5,7 +5,7 @@ Metadata:
     InfrastructureComponent: "true"
     application: "kubernetes"
 Resources:
-{{ if eq .Cluster.ConfigItems.eks "true" }}
+{{ if eq .Cluster.Provider "zalando-eks" }}
   EKSClusterRole:
     Type: AWS::IAM::Role
     Properties:
@@ -707,7 +707,7 @@ Resources:
                   - !Ref MasterIAMRole
         Version: 2012-10-17
       Path: /
-{{- if eq .Cluster.ConfigItems.eks "true"}}
+{{- if eq .Cluster.Provider "zalando-eks"}}
       ManagedPolicyArns:
         - "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"
         - "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
@@ -801,7 +801,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -872,7 +872,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1294,7 +1294,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1396,7 +1396,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1454,7 +1454,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1495,7 +1495,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1656,7 +1656,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1709,7 +1709,7 @@ Resources:
           {
             "Version": "2012-10-17",
             "Statement": [
-{{- if ne .Cluster.ConfigItems.eks "true" }}
+{{- if ne .Cluster.Provider "zalando-eks" }}
               {
                 "Action": [
                   "sts:AssumeRole"
@@ -1738,7 +1738,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -1833,7 +1833,7 @@ Resources:
             Version: 2012-10-17
           PolicyName: root
     Type: 'AWS::IAM::Role'
-{{- if ne .Cluster.ConfigItems.eks "true" }}
+{{- if ne .Cluster.Provider "zalando-eks" }}
   CloudControllerManagerIAMRole:
     Properties:
       AssumeRolePolicyDocument:
@@ -1986,7 +1986,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2267,7 +2267,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2326,7 +2326,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2377,7 +2377,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2629,7 +2629,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2670,7 +2670,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2721,7 +2721,7 @@ Resources:
               }
             ]
           }
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         - OIDC: !Select [1, !Split ["//", !GetAtt EKSCluster.OpenIdConnectIssuerUrl]]
 {{- else }}
         - OIDC: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
@@ -2812,7 +2812,7 @@ Resources:
             - "kms:*"
             - "tag:TagResources"
             Resource: "*"
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
           - Sid: "Allow EKSClusterRole access to describe the key"
             Effect: "Allow"
             Principal:
@@ -2835,7 +2835,7 @@ Resources:
             - "kms:Encrypt"
             - "kms:Decrypt"
 {{- end }}
-{{- if ne .Cluster.ConfigItems.eks "true" }}
+{{- if ne .Cluster.Provider "zalando-eks" }}
   MasterFilesEncryptionKey:
     Type: "AWS::KMS::Key"
     Properties:
@@ -2912,7 +2912,7 @@ Resources:
             Action:
             - "kms:Decrypt"
 Outputs:
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
   EKSControlPlaneEndpoint:
     Export:
       Name: "{{.Cluster.ID}}:eks-control-plane-endpoint"

diff --git a/cluster/manifests/01-aws-node/daemonset.yaml b/cluster/manifests/01-aws-node/daemonset.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

diff --git a/cluster/manifests/01-aws-node/sa.yaml b/cluster/manifests/01-aws-node/sa.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Cluster.ConfigItems.eks "true"}}
+{{- if eq .Cluster.Provider "zalando-eks"}}
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/cluster/manifests/01-coredns-local/daemonset-coredns.yaml b/cluster/manifests/01-coredns-local/daemonset-coredns.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       initContainers:
       - name: ensure-apiserver
-{{- if eq .Cluster.ConfigItems.eks "true" }}
+{{- if eq .Cluster.Provider "zalando-eks" }}
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/ensure-apiserver:master-6
 {{- else }}
         image: container-registry.zalando.net/teapot/ensure-apiserver:master-6
@@ -61,7 +61,7 @@ spec:
             command:
             - dig
             - "+short"
-{{- if and (eq .Cluster.ConfigItems.eks "true") (eq .Cluster.ConfigItems.eks_ip_family "ipv4") }}
+{{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv4") }}
             - "@127.0.0.1"
 {{- else }}
             - "::1"
@@ -101,7 +101,7 @@ spec:
 {{ end }}
 {{ if eq .Cluster.ConfigItems.dns_cache "dnsmasq" }}
       - name: dnsmasq
-        {{- if eq .Cluster.ConfigItems.eks "true" }}
+        {{- if eq .Cluster.Provider "zalando-eks" }}
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-dns-dnsmasq-nanny:1.17.4-master-15
         {{- else }}
         image: container-registry.zalando.net/teapot/k8s-dns-dnsmasq-nanny:1.17.4-master-15
@@ -147,7 +147,7 @@ spec:
             cpu: {{.Cluster.ConfigItems.dns_dnsmasq_cpu}}
             memory: {{.Cluster.ConfigItems.dns_dnsmasq_mem}}
       - name: sidecar
-        {{- if eq .Cluster.ConfigItems.eks "true" }}
+        {{- if eq .Cluster.Provider "zalando-eks" }}
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-dns-sidecar:1.17.4-master-15
         {{- else }}
         image: container-registry.zalando.net/teapot/k8s-dns-sidecar:1.17.4-master-15
@@ -181,7 +181,7 @@ spec:
             memory: {{.Cluster.ConfigItems.dns_dnsmasq_sidecar_mem}}
 {{ end }}
       - name: coredns
-        {{- if eq .Cluster.ConfigItems.eks "true" }}
+        {{- if eq .Cluster.Provider "zalando-eks" }}
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/coredns:1.11.3-master-24
         {{- else }}
         image: container-registry.zalando.net/teapot/coredns:1.11.3-master-24

diff --git a/cluster/manifests/01-coredns-local/service-coredns.yaml b/cluster/manifests/01-coredns-local/service-coredns.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   selector:
     component: coredns
-{{- if ne .Cluster.ConfigItems.eks "true"}}
+{{- if ne .Cluster.Provider "zalando-eks"}}
 # TODO: what to do with eks service range?
   clusterIP: 10.5.0.11
 {{- end}}

diff --git a/cluster/manifests/02-admission-control/deployment.yaml b/cluster/manifests/02-admission-control/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Cluster.ConfigItems.eks "true"}}
+{{- if eq .Cluster.Provider "zalando-eks"}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/cluster/manifests/02-admission-control/secret.yaml b/cluster/manifests/02-admission-control/secret.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Cluster.ConfigItems.eks "true"}}
+{{- if eq .Cluster.Provider "zalando-eks"}}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/cluster/manifests/02-admission-control/service.yaml b/cluster/manifests/02-admission-control/service.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Cluster.ConfigItems.eks "true"}}
+{{- if eq .Cluster.Provider "zalando-eks"}}
 apiVersion: v1
 kind: Service
 metadata: