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.

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

refactor(ec2): simplify convert_ec2_metadata_network_config #5071

Merged
merged 2 commits into from
Mar 19, 2024

Conversation

aciba90
Copy link
Contributor

@aciba90 aciba90 commented Mar 19, 2024

See individual commits.

Additional Context

https://warthogs.atlassian.net/browse/SC-1717

Test Steps

Checklist

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

@blackboxsw blackboxsw self-assigned this Mar 19, 2024
Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

LGTM!

aciba90 and others added 2 commits March 19, 2024 18:54
Correct `subnet-ipv6-cidr-blocks` instead of `subnet-ipv6-cidr-block`.
`routes` and `routing-policy` not overwritten in dual-stacks.
Fixes: canonicalGH-4861

Co-authored-by: Chad Smith <chad.smith@canonical.com>
@aciba90 aciba90 force-pushed the refactor-ds-ec2-net branch from 66b1689 to f87cba0 Compare March 19, 2024 17:55
@aciba90
Copy link
Contributor Author

aciba90 commented Mar 19, 2024

Thanks, @TheRealFalcon and @blackboxsw, for reviews and comments. I have addressed them.

Copy link
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

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

Thanks for the minor fixes. I've confirmed across upgrade path from daily PPA that we can now properly see ipv4/ipv6 route policies with this changeset on multi-nic dual-stack instances.

--- /etc/netplan/50-cloud-init.yaml	2024-03-19 19:12:34.256000129 +0000
+++ 50-cloud-init.yaml.PR5071	2024-03-19 19:00:12.680600947 +0000
@@ -18,9 +18,23 @@
             dhcp4: true
             dhcp4-overrides: &id002
                 route-metric: 200
+                use-routes: true
             dhcp6: true
             dhcp6-overrides: *id002
             match:
                 macaddress: 02:45:35:1b:63:4f
+            routes:
+            -   table: 101
+                to: 0.0.0.0/0
+                via: 192.168.0.1
+            -   table: 101
+                to: 192.168.0.0/20
+            -   table: 101
+                to: 2600:1f16:8cf:d900:0:0:0:0/64
+            routing-policy:
+            -   from: 192.168.4.35
+                table: 101
+            -   from: 2600:1f16:8cf:d900:8983:30de:9268:4a8f
+                table: 101
             set-name: ens6
     version: 2

@blackboxsw blackboxsw merged commit 02515b8 into canonical:main Mar 19, 2024
29 checks passed
@aciba90 aciba90 deleted the refactor-ds-ec2-net branch March 20, 2024 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants