Skip to content

Commit 7a4e9c3

Browse files
authored
fix: conditional set env rather than null value (#159)
<!-- ~ Copyright 2023 StreamNative, Inc. ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. --> <!-- ### Contribution Checklist - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review. - Each pull request should address only one issue, not mix up code from multiple issues. - Each commit in the pull request has a meaningful commit message - Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below. **(The sections below can be removed for hotfixes of typos)** --> ### Motivation This is follow up of #157 ### Modifications - Use conditional set env rather than null value, so we can leverage the default value, otherwise null value can break it. ### Verifying this change - [ ] Make sure that the change passes the CI checks. *(Please pick either of the following options)* This change is a trivial rework / code cleanup without any test coverage. *(or)* This change is already covered by existing tests, such as *(please describe tests)*. *(or)* This change added tests and can be verified as follows: *(example:)* - *Added integration tests for end-to-end deployment with large payloads (10MB)* - *Extended integration test for recovery after broker failure* ### Documentation - [x] `no-need-doc` Signed-off-by: Max Xu <[email protected]>
1 parent 5204b7a commit 7a4e9c3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@ module "eks" {
285285
most_recent = true
286286
before_compute = true
287287
configuration_values = jsonencode({
288-
env = {
288+
env = merge(var.enable_vpc_cni_prefix_delegation ? {
289289
# Reference docs https://docs.aws.amazon.com/eks/latest/userguide/cni-increase-ip-addresses.html
290-
ENABLE_PREFIX_DELEGATION = var.enable_vpc_cni_prefix_delegation ? "true" : null
291-
WARM_PREFIX_TARGET = var.enable_vpc_cni_prefix_delegation ? "1" : null
292-
}
290+
ENABLE_PREFIX_DELEGATION = "true"
291+
WARM_PREFIX_TARGET = "1"
292+
} : {})
293293
})
294294
}
295295
}

0 commit comments

Comments
 (0)