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

Jump to bottom

Set correct cluster tag on EKS #8487

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Set correct cluster tag on EKS #8487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e86fc78
Set correct cluster tag on EKS
mikkeloscar Oct 30, 2024
f0bf4ed
Enable Service Type LoadBalancer test
mikkeloscar Oct 31, 2024
a935713
Use cluster.Name as cluster identifier
mikkeloscar Oct 31, 2024
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
91 changes: 11 additions & 80 deletions cluster/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Metadata:
InfrastructureComponent: "true"
application: "kubernetes"
cluster-provider: "{{ .Cluster.Provider }}"
"kubernetes.io/cluster/{{.Cluster.Name}}": "owned"

Resources:
{{ if eq .Cluster.Provider "zalando-eks" }}
EKSClusterRole:
Expand All @@ -27,18 +29,11 @@ Resources:
EKSControlPlaneSecurityGroup:
Type: AWS::EC2::SecurityGroup
Properties:
# GroupDescription: "{{ .Cluster.Alias }}-eks-control-plane"
GroupDescription: "{{ .Cluster.Alias }}-control-plane"
# TODO:
# SecurityGroupIngress:
demonCoder95 marked this conversation as resolved.
Show resolved Hide resolved
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
EKSWorkerSecurityGroup:
Type: "AWS::EC2::SecurityGroup"
Properties:
# GroupDescription: "{{ .Cluster.ID }}-eks-worker-sg"
GroupDescription: "{{ .Cluster.ID }}-worker-sg"
SecurityGroupIngress:
- CidrIp: 0.0.0.0/0
Expand Down Expand Up @@ -99,8 +94,6 @@ Resources:
IpProtocol: udp
ToPort: 53
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
- Key: 'karpenter.sh/discovery'
Value: '{{ .Cluster.ID }}/WorkerNodeSecurityGroup'
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Expand All @@ -122,7 +115,7 @@ Resources:
EKSCluster:
Type: AWS::EKS::Cluster
Properties:
Name: "{{.Cluster.ID | eksID}}"
Name: "{{.Cluster.Name}}"
Version: "1.31"
RoleArn: !GetAtt EKSClusterRole.Arn
KubernetesNetworkConfig:
Expand Down Expand Up @@ -383,9 +376,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref MasterSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 10250
Type: 'AWS::EC2::SecurityGroupIngress'
MasterLoadBalancerNLB:
Expand All @@ -403,8 +393,6 @@ Resources:
{{ end }}
{{ end }}
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
- Key: "component"
Value: "kube-apiserver"
Type: network
Expand All @@ -421,8 +409,6 @@ Resources:
Port: 8443
Protocol: TLS
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
- Key: "component"
Value: "kube-apiserver"
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Expand Down Expand Up @@ -498,9 +484,6 @@ Resources:
FromPort: 53
IpProtocol: udp
ToPort: 53
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Type: 'AWS::EC2::SecurityGroup'
MasterSecurityGroupIngressFromFlannelToMaster:
Expand All @@ -509,9 +492,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: udp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 8472
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromMasterFlannelToMaster:
Expand All @@ -520,9 +500,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: udp
SourceSecurityGroupId: !Ref MasterSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 8472
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromMaster:
Expand All @@ -531,9 +508,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref MasterSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 443
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromWorker:
Expand All @@ -542,9 +516,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 443
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromWorkerToMasterKubeletAndKubeProxy:
Expand All @@ -553,9 +524,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 10250 # Kubelet
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromWorkerToNodeMonitor:
Expand All @@ -565,9 +533,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
Type: 'AWS::EC2::SecurityGroupIngress'
MasterSecurityGroupIngressFromWorkerToSkipperMetrics:
Properties:
Expand All @@ -576,9 +541,6 @@ Resources:
GroupId: !Ref MasterSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroup:
Properties:
Expand Down Expand Up @@ -643,8 +605,6 @@ Resources:
IpProtocol: udp
ToPort: 53
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
- Key: 'karpenter.sh/discovery'
Value: '{{ .Cluster.ID }}/WorkerNodeSecurityGroup'
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Expand All @@ -655,9 +615,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: udp
SourceSecurityGroupId: !Ref MasterSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 8472
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromMasterToKubelet:
Expand All @@ -666,9 +623,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref MasterSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these cases are dropped because we set the tag at stack level already

ToPort: 10250
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromWorkerToFlannel:
Expand All @@ -677,9 +631,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: udp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 8472
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromWorkerToWorkerKubeletAndKubeProxy:
Expand All @@ -688,9 +639,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 10250 # Kubelet
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromWorkerToWorkerSkipperMetrics:
Expand All @@ -699,9 +647,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 9911
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromWorkerToWorkerSkipperTokeninfoMetrics:
Expand All @@ -710,9 +655,6 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 9022
Type: 'AWS::EC2::SecurityGroupIngress'
WorkerSecurityGroupIngressFromWorkerToNodeMonitor:
Expand All @@ -722,27 +664,18 @@ Resources:
GroupId: !Ref WorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
Type: 'AWS::EC2::SecurityGroupIngress'
EFSSecurityGroupIngressFromWorkerSecurityGroup:
Properties:
FromPort: 2049
GroupId: !Ref EFSWorkerSecurityGroup
IpProtocol: tcp
SourceSecurityGroupId: !Ref WorkerSecurityGroup
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
ToPort: 2049
Type: 'AWS::EC2::SecurityGroupIngress'
EFSWorkerSecurityGroup:
Properties:
GroupDescription: worker to EFS sg
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Type: 'AWS::EC2::SecurityGroup'

Expand Down Expand Up @@ -774,8 +707,6 @@ Resources:
IpProtocol: tcp
ToPort: 443
Tags:
- Key: 'kubernetes.io/cluster/{{.Cluster.ID}}'
Value: owned
- Key: 'kubernetes:application'
Value: kube-ingress-aws-controller
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
Expand Down Expand Up @@ -1020,7 +951,7 @@ Resources:
],
"Condition": {
"StringEquals": {
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned"
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned"
},
"StringLike": {
"aws:RequestTag/karpenter.sh/nodepool": "*"
Expand All @@ -1041,7 +972,7 @@ Resources:
"Action": "ec2:CreateTags",
"Condition": {
"StringEquals": {
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned",
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned",
"ec2:CreateAction": [
"RunInstances",
"CreateFleet",
Expand All @@ -1060,7 +991,7 @@ Resources:
"Action": "ec2:CreateTags",
"Condition": {
"StringEquals": {
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned"
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned"
},
"StringLike": {
"aws:ResourceTag/karpenter.sh/nodepool": "*"
Expand All @@ -1086,7 +1017,7 @@ Resources:
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned"
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned"
},
"StringLike": {
"aws:ResourceTag/karpenter.sh/nodepool": "*"
Expand Down Expand Up @@ -1156,7 +1087,7 @@ Resources:
],
"Condition": {
"StringEquals": {
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned",
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned",
"aws:RequestTag/topology.kubernetes.io/region": "${AWS::Region}"
},
"StringLike": {
Expand All @@ -1173,9 +1104,9 @@ Resources:
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned",
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned",
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned",
demonCoder95 marked this conversation as resolved.
Show resolved Hide resolved
"aws:ResourceTag/topology.kubernetes.io/region": "${AWS::Region}",
"aws:RequestTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned",
"aws:RequestTag/topology.kubernetes.io/region": "${AWS::Region}"
},
"StringLike": {
Expand All @@ -1195,7 +1126,7 @@ Resources:
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.ID}}": "owned",
"aws:ResourceTag/kubernetes.io/cluster/{{.Cluster.Name}}": "owned",
"aws:ResourceTag/topology.kubernetes.io/region": "${AWS::Region}"
},
"StringLike": {
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/ingress-controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
# {{ end }}
env:
- name: CUSTOM_FILTERS
value: "tag:kubernetes.io/cluster/{{ .Cluster.ID }}=owned tag:node.kubernetes.io/role=worker tag:zalando.org/ingress-enabled=true"
value: "tag:kubernetes.io/cluster/{{.Cluster.Name}}=owned tag:node.kubernetes.io/role=worker tag:zalando.org/ingress-enabled=true"
- name: AWS_REGION
value: "{{ .Cluster.Region }}"
resources:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/z-karpenter/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
- name: ASSUME_ROLE_DURATION
value: "15m"
- name: CLUSTER_NAME
value: "{{.Cluster.ID}}"
value: "{{.Cluster.Name }}"
- name: VM_MEMORY_OVERHEAD_PERCENT
value: "0.075"
- name: RESERVED_ENIS
Expand Down
1 change: 1 addition & 0 deletions cluster/node-pools/worker-combined/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Metadata:
InfrastructureComponent: "true"
application: "kubernetes"
component: "shared-resource"
"kubernetes.io/cluster/{{.Cluster.Name}}": "owned"

Mappings:
Images:
Expand Down
1 change: 1 addition & 0 deletions cluster/node-pools/worker-splitaz/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Metadata:
InfrastructureComponent: "true"
application: "kubernetes"
component: "shared-resource"
"kubernetes.io/cluster/{{.Cluster.Name}}": "owned"

Mappings:
Images:
Expand Down
1 change: 0 additions & 1 deletion test/e2e/run_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ if [ "$e2e" = true ]; then
"Mirror pods should be created for the main Kubernetes components \[Zalando\]"
"Should audit API calls to create, update, patch, delete pods. \[Audit\] \[Zalando\]"
"should validate permissions for \[Authorization\] \[RBAC\] \[Zalando\]" # TODO: temporary disabled because feature is missing
"Should create DNS entry \[Zalando\]" # TODO: broken because type: LoadBalancer doesn't work
)
fi

Expand Down