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

Prepare for version 1.20 #10101

Merged
merged 3 commits into from
Oct 29, 2020
Merged

Prepare for version 1.20 #10101

merged 3 commits into from
Oct 29, 2020

Conversation

johngmyers
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 25, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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 area/documentation area/provider/aws Issues or PRs related to aws provider approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 25, 2020
@johngmyers johngmyers force-pushed the prep-1.20 branch 3 times, most recently from df0ec88 to b843f64 Compare October 25, 2020 03:24
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 25, 2020
@johngmyers johngmyers force-pushed the prep-1.20 branch 3 times, most recently from 7a57a6a to 14548c8 Compare October 25, 2020 03:49
@johngmyers johngmyers changed the title Prep 1.20 Prepare for version 1.20 Oct 25, 2020
permalinks/upgrade_k8s.md Outdated Show resolved Hide resolved
@hakman
Copy link
Member

hakman commented Oct 25, 2020

Looks fine to me. @rifelpet, maybe you want to take a look also.

@hakman hakman requested a review from rifelpet October 25, 2020 09:57
@rifelpet
Copy link
Member

The 1.19 release notes currently mention that only Terraform-0.12 will be removed, it doesn't mention that TerraformJSON will be removed, so we'd need to keep target_0_11.go and the MinimalJSON integration test unless we decide to also deprecate and remove TerraformJSON.

@johngmyers
Copy link
Member Author

johngmyers commented Oct 25, 2020

@rifelpet TerraformJSON does nothing unless Terraform-0.12 is off. So it doesn't make sense to keep TerraformJSON as a no-op. And I see no reason to require a deprecation notice for a feature flag that defaults off.

@rifelpet
Copy link
Member

I was thinking TerraformJSON would imply the current TerraformJSON,-Terraform-0.12 behavior but -Terraform-0.12 on its own would no longer be valid. #9940 implements much of this so it might be better to defer those changes to that PR. I agree that removing a feature flag that defaults to off shouldn't require a deprecation notice but it might still be helpful to get user feedback, given that the Terraform JSON output is still a valid use-case for Terraform 0.12+.

@johngmyers
Copy link
Member Author

I created #10106 to effect that change in the TerraformJSON semantics.

@johngmyers johngmyers changed the title Prepare for version 1.20 WIP Prepare for version 1.20 Oct 25, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 25, 2020
@johngmyers johngmyers force-pushed the prep-1.20 branch 3 times, most recently from 4c8ba76 to 5e78336 Compare October 26, 2020 00:06
@johngmyers johngmyers changed the title WIP Prepare for version 1.20 Prepare for version 1.20 Oct 26, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 26, 2020
@rifelpet
Copy link
Member

I believe this is ready for a rebase and merge.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2020
@rifelpet
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 29, 2020
@k8s-ci-robot k8s-ci-robot merged commit 80f7b8e into kubernetes:master Oct 29, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Oct 29, 2020
@johngmyers johngmyers deleted the prep-1.20 branch October 29, 2020 23:44
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 area/provider/aws Issues or PRs related to aws provider 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

4 participants