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.

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

Deprecate TerraformJSON feature flag #12341

Merged
merged 2 commits into from
Sep 17, 2021

Conversation

rifelpet
Copy link
Member

This breaks out portions of #12322 into separate PRs. Terraform's JSON support doesn't support provider aliases which means we cant use TerraformManagedFiles with it. This PR adds an error check ensuring they aren't used concurrently.

Given that we intend to eventually enable TerraformManagedFiles unconditionally and that TerraformJSON was implemented as a stop-gap until we had native HCL2 support for Terraform 0.12, it makes more sense to deprecate and eventually remove the TerraformJSON feature flag.

This also removes the TerraformJSON integration test. The test would need to disable TerraformManagedFiles which is pretty invasive to our integration test setup (the expectedFileNames would need to exclude all of the aws_s3_bucket_objects) . Given that its deprecated and would be the only reason for such complexity, I opted to just remove the test altogether.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added area/documentation needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 17, 2021
The FF is deprecated and would require a lot of effort to support disabling TerraformManagedFiles (which is required) in this one integration test case
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Sep 17, 2021
@k8s-ci-robot k8s-ci-robot merged commit 6612ba1 into kubernetes:master Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 17, 2021
k8s-ci-robot added a commit that referenced this pull request Sep 18, 2021
…41-origin-release-1.22

Automated cherry pick of #12341: Disallow TerraformJSON + TerraformManagedFiles and
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants