Don't set terraform user_data if it is empty #8744
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
rifelpet
changed the title
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rifelpet The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
Ugh integration tests failing because we shouldnt expect a bastion user_data file unless the additionalUserData isnt empty. adding support for that in the integration tests will be a significant change which would conflict with #8737 so i'm inclined to wait for that to get merged which might be a while. |
Merged
|
/hold for #8737 and some rebase work ill do afterwards |
k8s-ci-robot
added
the
do-not-merge/hold
Bastion hosts have no user_data by default. This is not valid in terraform, based on the error messages reported here [0] The Terraform provider code says user_data is optional for both LaunchConfigurations and LaunchTemplates [1] [2] This change prevents the user_data property from being added to aws_launch_configuration and aws_launch_template resources unless the string is not empty. [0] https://travis-ci.org/github/kubernetes/kops/jobs/662472020 [1] https://github.com/terraform-providers/terraform-provider-aws/blob/04d24f80f3b740d0c9d74d97e818b7da15cb96c5/aws/resource_aws_launch_configuration.go#L74-L76 [2] https://github.com/terraform-providers/terraform-provider-aws/blob/04d24f80f3b740d0c9d74d97e818b7da15cb96c5/aws/resource_aws_launch_template.go#L510-L512
rifelpet
force-pushed
the
tf-bastion-userdata
branch
from
eec7b6a
to
54c3b2f
Compare
k8s-ci-robot
added
size/M
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bastion hosts have no user_data by default. This is not valid in terraform, evidenced by the error messages reported here.
The Terraform provider code says user_data is optional for both LaunchConfigurations and LaunchTemplates.
This change prevents the user_data property from being added to
aws_launch_configurationandaws_launch_templateresources if the string is empty.