Commit 6154cdc
authored
fix: use interruptionQueue Helm value for Karpenter >= v0.33.0 (#8844)
* fix: use interruptionQueue Helm value for Karpenter >= v0.33.0
The Karpenter chart renamed its interruption queue Helm value when it
flattened `settings`. Charts before v0.33.0 read
`settings.aws.interruptionQueueName`; the flattened layout reads
`settings.interruptionQueue`.
eksctl built a single `settings` map and re-nested it under `aws` for older
charts, so both version branches shared the `interruptionQueueName`
spelling. On charts >= v0.33.0 Helm silently ignores that unknown key, so
`INTERRUPTION_QUEUE` is never set on the Karpenter pod and spot
interruption handling is disabled with no error surfaced to the user.
Instances are terminated without Karpenter draining them first.
Select the queue key per version branch instead of sharing one map: the
`< 0.33.0` path keeps `settings.aws.interruptionQueueName` unchanged, and
the `>= 0.33.0` path now sends `settings.interruptionQueue`. No API, flag
or documentation change; `withSpotInterruptionQueue` is untouched.
The existing `>= 0.33.0` unit expectation encoded the wrong key, so it is
corrected to the key the chart actually reads. The two
`settings.aws.interruptionQueueName` specs are left as-is and act as the
regression guard for the legacy contract.
Signed-off-by: warren <warren.chen830@gmail.com>
* fix: only advertise the interruption queue when eksctl created it
Correcting the misspelled Helm key activated a second, previously masked
defect. pkg/cfn/builder creates the SQS queue -- and grants the controller
role sqs:ReceiveMessage on it -- only when withSpotInterruptionQueue is
enabled, and that flag has no defaulting, so it is off by default.
Sending the queue name unconditionally therefore pointed a default-configuration
cluster on >= 0.33.0 at a queue that was never created and that it has no
permission to poll. The name is now sent only when the queue was provisioned;
when the flag is enabled the value is unchanged, so no working setup is affected.
Adds specs for the disabled case on both chart layouts, and asserts the whole
values map on the flattened path as the legacy specs already do.
---------
Signed-off-by: warren <warren.chen830@gmail.com>
Co-authored-by: warren830 <warren830@users.noreply.github.com>1 parent a4732a5 commit 6154cdc
2 files changed
Lines changed: 85 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
75 | 110 | | |
76 | 111 | | |
77 | 112 | | |
78 | 113 | | |
79 | 114 | | |
80 | 115 | | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
| 116 | + | |
87 | 117 | | |
88 | 118 | | |
89 | 119 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | 120 | | |
99 | 121 | | |
100 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
33 | 36 | | |
34 | 37 | | |
35 | 38 | | |
| |||
90 | 93 | | |
91 | 94 | | |
92 | 95 | | |
93 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
94 | 102 | | |
95 | 103 | | |
96 | 104 | | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
97 | 145 | | |
98 | 146 | | |
99 | 147 | | |
| |||
0 commit comments