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

Make PRR metadata required #2672

Merged
merged 4 commits into from
May 5, 2021

Conversation

ehashman
Copy link
Member

@ehashman ehashman commented May 4, 2021

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 4, 2021
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 4, 2021
@ehashman ehashman force-pushed the require-current-milestone branch from 724e7e9 to 3c7b2da Compare May 5, 2021 03:26
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. area/provider/aws Issues or PRs related to aws provider area/provider/azure Issues or PRs related to azure provider kind/kep Categorizes KEP tracking issues and PRs modifying the KEP directory sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/autoscaling Categorizes an issue or PR as relevant to SIG Autoscaling. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/multicluster Categorizes an issue or PR as relevant to SIG Multicluster. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/security Categorizes an issue or PR as relevant to SIG Security. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 5, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2021
@ehashman ehashman changed the title [WIP] Make PRR metadata required Make PRR metadata required May 5, 2021
@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 May 5, 2021
@ehashman
Copy link
Member Author

ehashman commented May 5, 2021

Assuming this passes verify in CI...

Added default values of "1.0" and "alpha" for KEPs missing metadata. Started to actually fill values in but there were nearly 100 that needed an update so I gave up. We can leave that to KEP authors/SIG leads to fix IMO, it'll be easier if we spread out the work.

@ehashman ehashman force-pushed the require-current-milestone branch from af7bbd5 to f85c19b Compare May 5, 2021 03:40
@@ -32,6 +32,8 @@ func (r *Repo) Validate() (
valErrMap map[string][]error,
err error,
) {
valErrMap = map[string][]error{}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This not being initialized was causing the error map to not get populated below.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -99,6 +101,7 @@ func (r *Repo) Validate() (
if kepParseErr != nil {
return warnings, valErrMap, errors.Wrap(kepParseErr, "parsing KEP file")
}
kep.Filename = filename
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This lets me print out an error where the offending file is actually referenced and I can fix it more easily.

Comment on lines 22 to 23
latest-milestone: "1.0"
stage: "alpha"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we have validation on values and I was too lazy to add "unknowns" I set the defaults to 1.0/alpha for everything that was marked implementable.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of "0.0", can we maybe set "0.0" - to make it more clear that it's a marker?

@ehashman
Copy link
Member Author

ehashman commented May 5, 2021

Okay, I think this should be ready.

@ehashman
Copy link
Member Author

ehashman commented May 5, 2021

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label May 5, 2021
@wojtek-t
Copy link
Member

wojtek-t commented May 5, 2021

/label tide/merge-method-squash

@ehashman - wow, what is that?

@@ -27,3 +27,6 @@ replaces:
- n/a
superseded-by:
- n/a

latest-milestone: "0.0"
stage: "alpha"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry - I hate myself for this comment, but I'm wondering if we should consider "pre-alpha" (or sth like that) for those cases.

When I see a stage in those files, I conceptually think that this stage is happening, and in some cases it's not necessary true. (It would also be a cleaner marker).

I'm happy to be outvoted though - @ehashman @johnbelamaric @deads2k for thoughts

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried setting "unknown" previously but it got rejected by validation and I wasn't sure if it made sense to add it as a new state.

@ehashman
Copy link
Member Author

ehashman commented May 5, 2021

/label tide/merge-method-squash

@ehashman - wow, what is that?

Will make the bot squash my commits on merge so I don't have to 🤣

@johnbelamaric
Copy link
Member

/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 May 5, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ehashman, johnbelamaric

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 May 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit f343d8b into kubernetes:master May 5, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone May 5, 2021
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/enhancements Issues or PRs related to the Enhancements subproject area/provider/aws Issues or PRs related to aws provider area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/kep Categorizes KEP tracking issues and PRs modifying the KEP directory lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/autoscaling Categorizes an issue or PR as relevant to SIG Autoscaling. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/multicluster Categorizes an issue or PR as relevant to SIG Multicluster. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/security Categorizes an issue or PR as relevant to SIG Security. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants