Skip to content

Drain 5.60.96.10 and .11 from the prod NAT gateway - #279

Merged
flamingspaz merged 1 commit into
mainfrom
drain-10-11-from-prod-nat
Nov 16, 2026
Merged

flamingspaz merged 1 commit into
mainfrom
drain-10-11-from-prod-nat

Conversation

@flamingspaz

@flamingspaz flamingspaz commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

The drain is already done in AWS and the stack state already matches. Merging only brings main in line; this change is a no-op for the NAT gateway.

Removes 5.60.96.10 and 5.60.96.11 from nat_gateway_secondary_allocation_ids of the prod NAT gateway nat-09d2add6f5ecd87e0. Prod now sends on .8 (primary) and .9. The two addresses were released from the legacy account on 2026-11-16 and will be allocated in tb-prod as the primaries of its Stalwart NAT gateways (thunderbird/platform-infrastructure#1600).

What was done

Pulumi previewed the removal as a NatGateway replace (see below), so the drain was done with the AWS CLI and reconciled afterwards:

  1. aws ec2 disassociate-nat-gateway-address for both, 2026-11-16 17:35 UTC; both gone at 17:41 UTC.
  2. pulumi refresh --target on only mailstrom-prod-vpc-nat in mzla-services/mailstrom/prod: secondaryAllocationIds now holds only eipalloc-037682d640024609a (.9), and secondaryPrivateIpAddressCount dropped from state.

Until this merges, an up from main would try to re-associate two allocation ids that no longer exist.

Preview after the refresh

Preview of this branch: the NAT gateway and the route table are same. What is left is the baseline that main also shows, 1 to create, 103 to delete, 214 unchanged:

  • The 103 deletes are the known tb_pulumi preview artifact (monitoring and StackAccessPolicies resources built after the others resolve). Per Ryan Jung, an up does not delete them.
  • The 1 create is the AmazonSSMManagedInstanceCore attachment on the Stalwart node role from Add SSM Session Manager access to Stalwart nodes #253, not yet applied to prod. It is unrelated to this change.

Open question

Before the drain, this change previewed as a replace of the protected NAT gateway, with secondaryPrivateIpAddressCount: [unknown]. I have not confirmed the cause. Removing further secondaries through Pulumi would likely hit the same thing.

Part of thunderbird/platform-infrastructure#1598 (PR 1) and thunderbird/platform-infrastructure#1600.

🤖 Generated with Claude Code

The two addresses move to the tb-prod Stalwart NAT gateways ahead of the prod
migration (thunderbird/platform-infrastructure#1600). Prod keeps sending on
.8 (primary) and .9.

Co-Authored-By: Claude <noreply@anthropic.com>
@flamingspaz flamingspaz changed the title HOLD: Drain 5.60.96.10 and .11 from the prod NAT gateway Drain 5.60.96.10 and .11 from the prod NAT gateway Nov 16, 2026
@flamingspaz
flamingspaz marked this pull request as ready for review November 16, 2026 19:14
@flamingspaz
flamingspaz merged commit e66e4e5 into main Nov 16, 2026
1 check passed
@flamingspaz
flamingspaz deleted the drain-10-11-from-prod-nat branch November 16, 2026 19:20
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.

1 participant