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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #8145: Enabling JSON output for Terraform instead of writing the HCL #8926

Merged
merged 1 commit into from
Apr 23, 2020
Merged

Automated cherry pick of #8145: Enabling JSON output for Terraform instead of writing the HCL #8926

merged 1 commit into from
Apr 23, 2020

Conversation

johanneswuerbach
Copy link
Contributor

Cherry pick of #8145 on release-1.17.

#8145: Enabling JSON output for Terraform instead of writing the HCL

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Apr 16, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 16, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @johanneswuerbach. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 16, 2020
@johanneswuerbach johanneswuerbach force-pushed the automated-cherry-pick-of-#8145-upstream-release-1.17 branch 3 times, most recently from 2974fd0 to 52c1aff Compare April 16, 2020 15:03
@mccare @johanneswuerbach
Enabling JSON output for Terraform instead of writing the HCL syntax …
819bfa2 
…tf file. JSON syntax is officially supported in 0.12 and a terraform version requirement will be set. For previous installations you need to delete the .tf file by hand. JSON generation will fail if kubernetes.tf is present.

Added Integration Test using minimal test setup

Added documentation. For terraform 0.12 support the resource names need to be changed still
@johanneswuerbach johanneswuerbach force-pushed the automated-cherry-pick-of-#8145-upstream-release-1.17 branch from 52c1aff to 819bfa2 Compare April 16, 2020 15:14
@johanneswuerbach
Copy link
Contributor Author

/assign @mikesplain

@johanneswuerbach johanneswuerbach mentioned this pull request Apr 16, 2020
Merged
@rifelpet
Copy link
Member

I think this makes sense to cherry-pick. Months ago when #8145 landed we discussed it targeting 1.18 and the native hcl2 syntax targeting 1.19. We managed to get the hcl2 syntax into 1.18, so it might be good to offer this as an intermediate step in 1.17. The renaming of resources was also cherry-picked back to 1.17, so this should be the only thing needed to support terraform 0.12 in kops 1.17.

The PR itself is very low risk: the only logic changes are behind a feature flag that defaults to disabled.

Even though we're pretty late into the 1.17 release cycle I think this is safe and would help users with their terraform 0.12 adoption. Lets do it :)

Perhaps its worthy of a mention in the 1.17 release notes? Would you be able to add a note in the Significant Changes section here in a followup PR? It should probably mention the "required action" item regarding resource renaming too. If not I can do it.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 23, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johanneswuerbach, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 23, 2020
@k8s-ci-robot k8s-ci-robot merged commit d2a47e6 into kubernetes:release-1.17 Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrisz100 chrisz100 Awaiting requested review from chrisz100

@rifelpet rifelpet Awaiting requested review from rifelpet

Assignees

@mikesplain mikesplain

@rifelpet rifelpet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.17
Development

Successfully merging this pull request may close these issues.
5 participants
@johanneswuerbach @k8s-ci-robot @rifelpet @mikesplain @mccare