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

Automated cherry pick of #12349: Use EC2 and Metadata IPv6 endpoints in IPv6 mode for EBS CSI #12353: Fix EC2 IPv6 endpoint for EBS CSI Driver controller #12358

Merged
merged 2 commits into from
Sep 19, 2021
Merged

Automated cherry pick of #12349: Use EC2 and Metadata IPv6 endpoints in IPv6 mode for EBS CSI #12353: Fix EC2 IPv6 endpoint for EBS CSI Driver controller #12358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19e1f62
Use EC2 and Metadata IPv6 endpoints in IPv6 mode for EBS CSI Driver
hakman Sep 18, 2021
fcb40f9
Fix EC2 IPv6 endpoint for EBS CSI Driver controller
hakman Sep 18, 2021
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
12 changes: 12 additions & 0 deletions upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ spec:
- --logtostderr
- --v=2
env:
{{- if IsIPv6Only }}
- name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
value: IPv6
{{- end }}
- name: CSI_ENDPOINT
value: unix:/csi/csi.sock
- name: CSI_NODE_NAME
Expand Down Expand Up @@ -435,6 +439,14 @@ spec:
- "--extra-tags={{ CloudLabels }}"
- --v=5
env:
{{- if IsIPv6Only }}
# TODO: Replace with "AWS_USE_DUALSTACK_ENDPOINT=true" when the relevant PR is merged:
# https://github.com/aws/aws-sdk-go/pull/3938
- name: AWS_EC2_ENDPOINT
value: https://api.ec2.{{ Region }}.aws
- name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
value: IPv6
{{- end }}
- name: CSI_NODE_NAME
valueFrom:
fieldRef:
Expand Down