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

Optional support for AWS VPC CNI Custom Networking #8510

Open
wants to merge 2 commits into
base: eks
Choose a base branch
from
+26 −2
Open

Optional support for AWS VPC CNI Custom Networking #8510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e98a10
Custom networking
mikkeloscar Nov 4, 2024
813ac39
Use custom CLM
mikkeloscar Nov 5, 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
1 change: 1 addition & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,7 @@ eks_ip_family: "ipv4"
# prefix delegation can only be configured for ipv4. For ipv6 it can only be
# true.
aws_vpc_cni_prefix_delegation: "true"
aws_vpc_cni_custom_networking: "false"
eks_zalando_iam_aws_proxy_cpu: "100m"
eks_zalando_iam_aws_proxy_memory: "512Mi"
eks_zalando_iam_aws_proxy_hpa_max_replicas: "10"
Expand Down
6 changes: 5 additions & 1 deletion cluster/manifests/01-aws-node/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ spec:
- name: AWS_VPC_ENI_MTU
value: "9001"
- name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG
value: "false"
value: "{{ .Cluster.ConfigItems.aws_vpc_cni_custom_networking }}"
# {{ if eq .Cluster.ConfigItems.aws_vpc_cni_custom_networking "true" }}
- name: ENI_CONFIG_LABEL_DEF
value: topology.kubernetes.io/zone
# {{ end }}
- name: AWS_VPC_K8S_CNI_EXTERNALSNAT
value: "false"
- name: AWS_VPC_K8S_CNI_LOGLEVEL
Expand Down
19 changes: 19 additions & 0 deletions cluster/manifests/01-aws-node/pod_subnets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# {{ if eq .Cluster.ConfigItems.aws_vpc_cni_custom_networking "true" }}
# {{ with $data := . }}
# {{ with $azCount := len $data.Values.availability_zones }}
# {{ range $az := $data.Values.availability_zones }}
# {{ with $azID := azID $az }}
---
apiVersion : crd.k8s.amazonaws.com/v1alpha1
kind : ENIConfig
metadata:
name: "{{$az}}"
spec:
securityGroups:
- {{ $data.Values.ClusterStackOutputs.EKSWorkerSecurityGroup }}
subnet: "{{ index $data.Values.pod_subnets $az }}"
# {{end}}
# {{end}}
# {{end}}
# {{end}}
# {{end}}
2 changes: 1 addition & 1 deletion test/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN chmod +x /usr/bin/kubectl
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo

# copy CLM
COPY --from=container-registry.zalando.net/teapot/cluster-lifecycle-manager:latest /clm /usr/bin/clm
COPY --from=container-registry-test.zalando.net/teapot/cluster-lifecycle-manager:pr-830-1 /clm /usr/bin/clm
COPY --from=container-registry.zalando.net/teapot/aws-account-creator:latest /aws-account-creator /usr/bin/aws-account-creator

ADD . /workdir
Expand Down