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

Add kind/kep label #9437

Merged
merged 1 commit into from
Oct 1, 2018
Merged

Conversation

justaugustus
Copy link
Member

@k8s-ci-robot k8s-ci-robot added sig/pm sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. area/label_sync Issues or PRs related to code in /label_sync size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 17, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 17, 2018
@cblecker
Copy link
Member

/hold
Two things..
First, I think this might be a better fit for “area/“ rather than “kind/“. We just did a cleanup of kind/ (cc @jberkus @spiffxp)

Second, does every repo in all kubernetes orgs need this? Or is this more for just k/community and k/features?

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 17, 2018
@justaugustus
Copy link
Member Author

@cblecker --

  1. Seems that we primarily use area/* to signify areas of code. As KEPs are cross-cutting, I would hesitate to add them as a specific "area". We have some precedent for using kind in instances like this (kind/feature, kind/design) and KEPs would fall into a similar designation.
  2. This would likely only be used for k/community and k/features. I forgot we had the per-repo labels now. Will fix that up.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. area/prow Issues or PRs related to prow area/prow/deck Issues or PRs related to prow's deck component and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 17, 2018
@justaugustus
Copy link
Member Author

Hey @k8s-ci-robot, promise I'm actually running the script. See?

[augustus@auggiebook01 test-infra]$ ./hack/update-labels.sh
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 0.573s, Critical Path: 0.19s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra

/test pull-test-infra-verify-labels

@justaugustus
Copy link
Member Author

(Fun fact: the pull-test-infra-verify-labels job will fail if the label update and hack script aren't committed together. Dropped a PR to update the instructions: #9439)

@fejta
Copy link
Contributor

fejta commented Sep 17, 2018

/uncc

I'm happy if cblecker is happy

@k8s-ci-robot k8s-ci-robot removed the request for review from fejta September 17, 2018 14:50
@spiffxp
Copy link
Member

spiffxp commented Sep 18, 2018

As much as I cringe to see another kind/ label, as long as it's restricted to those two repos I guess I'm OK with it. To me area ~= subproject, and while I do think "make keps usable" is itself a subproject (ie: area/keps), I don't think an individual kep is part of that subproject.

Ideally this would be obviated by moving keps to their own repo, so you could just query for repo:kubernetes/keps instead of org:kubernetes label:kind/kep

kubernetes/community:
labels:
- color: cc99ff
description: Categorizes issue or PR as related to a KEP.
Copy link
Member

Choose a reason for hiding this comment

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

That said, I don't see mention of the reason or need for kind/kep in the meta-kep proposal. This description is too vague. ie: what I do not want to see is PR's that implement a KEP being labeled as kind/kep, that is not a kind of work.

I was assuming it was solely to be able to query what PR's are KEPs as an interim to transitioning them into kubernetes/keps. Which now that I think of it, does seem like an appropriate use for an area/keps label, to signify something is going to be done with these as part of that effort.

@spiffxp
Copy link
Member

spiffxp commented Sep 18, 2018

tl;dr I just talked myself back into wanting to block this. Why do you need this label?

@BenTheElder
Copy link
Member

What are your thoughts on keps having their own repo? @cblecker @justaugustus ? This sounds nice to me. IMO we should try more focused repos and less heavily overloaded ones. It would also help and with interested parties (reviewers?) trying to subscribe to KEPs without signing up to monitor all community changes.

@dims
Copy link
Member

dims commented Sep 18, 2018

+1 to a kubernetes/keps will be helpful to just monitor that.

@spiffxp
Copy link
Member

spiffxp commented Sep 19, 2018

I'd like to see KEP-1a get to implementable before moving on this

@justaugustus
Copy link
Member Author

I'd like to see KEP-1a get to implementable before moving on this

@spiffxp -- Ideally, I'd love to see this go in first, so I can release kubernetes/community#2677.
That way, KEPs in flight start to get labelled appropriately and it's less work to read through PRs to label them later.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 23, 2018
@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 28, 2018
@justaugustus
Copy link
Member Author

/retest

@justaugustus
Copy link
Member Author

The hack/update-labels.sh is busted it seems. It's moving the css around, despite there being no changes between commits:

[augustus@auggiebook01 test-infra]$ git commit prow/
[kep-label 9656786fb] update
 1 file changed, 5 insertions(+), 5 deletions(-)
[augustus@auggiebook01 test-infra]$ git rebase -i HEAD~2
[detached HEAD 0387f4d55] Add kind/kep label for k/{community,features}
 Date: Sun Sep 16 20:54:47 2018 -0400
 3 files changed, 32 insertions(+), 4 deletions(-)
Successfully rebased and updated refs/heads/kep-label.
[augustus@auggiebook01 test-infra]$ time ./hack/update-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 1.123s, Critical Path: 0.64s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra

real	0m1.464s
user	0m0.145s
sys	0m0.092s
[augustus@auggiebook01 test-infra]$ git status
On branch kep-label
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   prow/cmd/deck/static/labels.css

no changes added to commit (use "git add" and/or "git commit -a")
[augustus@auggiebook01 test-infra]$ git diff
diff --git a/prow/cmd/deck/static/labels.css b/prow/cmd/deck/static/labels.css
index 5be258235..20f0355c2 100644
--- a/prow/cmd/deck/static/labels.css
+++ b/prow/cmd/deck/static/labels.css
@@ -513,21 +513,6 @@
     color: #000000;
 }
 
-.kindx00002fkep {
-    background-color: #cc99ff;
-    color: #000000;
-}
-
-.kindx00002fkep {
-    background-color: #cc99ff;
-    color: #000000;
-}
-
-.areax00002fconformance {
-    background-color: #0052cc;
-    color: #ffffff;
-}
-
 .areax00002fboskos {
     background-color: #0052cc;
     color: #ffffff;
@@ -708,4 +693,19 @@
     color: #ffffff;
 }
 
+.kindx00002fkep {
+    background-color: #cc99ff;
+    color: #000000;
+}
+
+.kindx00002fkep {
+    background-color: #cc99ff;
+    color: #000000;
+}
+
+.areax00002fconformance {
+    background-color: #0052cc;
+    color: #ffffff;
+}
+
 
[augustus@auggiebook01 test-infra]$ git commit prow/
[kep-label 6e7bd22b4] update
 1 file changed, 15 insertions(+), 15 deletions(-)
[augustus@auggiebook01 test-infra]$ git rebase -i HEAD~2
[detached HEAD 8a2da8e5c] Add kind/kep label for k/{community,features}
 Date: Sun Sep 16 20:54:47 2018 -0400
 3 files changed, 39 insertions(+), 11 deletions(-)
Successfully rebased and updated refs/heads/kep-label.
[augustus@auggiebook01 test-infra]$ time ./hack/update-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 1.081s, Critical Path: 0.55s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community

real	0m1.359s
user	0m0.128s
sys	0m0.095s
[augustus@auggiebook01 test-infra]$ git status
On branch kep-label
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   prow/cmd/deck/static/labels.css

no changes added to commit (use "git add" and/or "git commit -a")
[augustus@auggiebook01 test-infra]$ git diff
diff --git a/prow/cmd/deck/static/labels.css b/prow/cmd/deck/static/labels.css
index 20f0355c2..18ea6620f 100644
--- a/prow/cmd/deck/static/labels.css
+++ b/prow/cmd/deck/static/labels.css
@@ -513,6 +513,11 @@
     color: #000000;
 }
 
+.areax00002fconformance {
+    background-color: #0052cc;
+    color: #ffffff;
+}
+
 .areax00002fboskos {
     background-color: #0052cc;
     color: #ffffff;
@@ -703,9 +708,4 @@
     color: #000000;
 }
 
-.areax00002fconformance {
-    background-color: #0052cc;
-    color: #ffffff;
-}
-

/override pull-test-infra-verify-labels

@k8s-ci-robot
Copy link
Contributor

@justaugustus: justaugustus unauthorized: /override is restricted to repo administrators

In response to this:

The hack/update-labels.sh is busted it seems. It's moving the css around, despite there being no changes between commits:

[augustus@auggiebook01 test-infra]$ git commit prow/
[kep-label 9656786fb] update
1 file changed, 5 insertions(+), 5 deletions(-)
[augustus@auggiebook01 test-infra]$ git rebase -i HEAD~2
[detached HEAD 0387f4d55] Add kind/kep label for k/{community,features}
Date: Sun Sep 16 20:54:47 2018 -0400
3 files changed, 32 insertions(+), 4 deletions(-)
Successfully rebased and updated refs/heads/kep-label.
[augustus@auggiebook01 test-infra]$ time ./hack/update-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
 bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 1.123s, Critical Path: 0.64s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra

real	0m1.464s
user	0m0.145s
sys	0m0.092s
[augustus@auggiebook01 test-infra]$ git status
On branch kep-label
Changes not staged for commit:
 (use "git add <file>..." to update what will be committed)
 (use "git checkout -- <file>..." to discard changes in working directory)

  modified:   prow/cmd/deck/static/labels.css

no changes added to commit (use "git add" and/or "git commit -a")
[augustus@auggiebook01 test-infra]$ git diff
diff --git a/prow/cmd/deck/static/labels.css b/prow/cmd/deck/static/labels.css
index 5be258235..20f0355c2 100644
--- a/prow/cmd/deck/static/labels.css
+++ b/prow/cmd/deck/static/labels.css
@@ -513,21 +513,6 @@
    color: #000000;
}

-.kindx00002fkep {
-    background-color: #cc99ff;
-    color: #000000;
-}
-
-.kindx00002fkep {
-    background-color: #cc99ff;
-    color: #000000;
-}
-
-.areax00002fconformance {
-    background-color: #0052cc;
-    color: #ffffff;
-}
-
.areax00002fboskos {
    background-color: #0052cc;
    color: #ffffff;
@@ -708,4 +693,19 @@
    color: #ffffff;
}

+.kindx00002fkep {
+    background-color: #cc99ff;
+    color: #000000;
+}
+
+.kindx00002fkep {
+    background-color: #cc99ff;
+    color: #000000;
+}
+
+.areax00002fconformance {
+    background-color: #0052cc;
+    color: #ffffff;
+}
+

[augustus@auggiebook01 test-infra]$ git commit prow/
[kep-label 6e7bd22b4] update
1 file changed, 15 insertions(+), 15 deletions(-)
[augustus@auggiebook01 test-infra]$ git rebase -i HEAD~2
[detached HEAD 8a2da8e5c] Add kind/kep label for k/{community,features}
Date: Sun Sep 16 20:54:47 2018 -0400
3 files changed, 39 insertions(+), 11 deletions(-)
Successfully rebased and updated refs/heads/kep-label.
[augustus@auggiebook01 test-infra]$ time ./hack/update-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
 bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 1.081s, Critical Path: 0.55s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community

real	0m1.359s
user	0m0.128s
sys	0m0.095s
[augustus@auggiebook01 test-infra]$ git status
On branch kep-label
Changes not staged for commit:
 (use "git add <file>..." to update what will be committed)
 (use "git checkout -- <file>..." to discard changes in working directory)

  modified:   prow/cmd/deck/static/labels.css

no changes added to commit (use "git add" and/or "git commit -a")
[augustus@auggiebook01 test-infra]$ git diff
diff --git a/prow/cmd/deck/static/labels.css b/prow/cmd/deck/static/labels.css
index 20f0355c2..18ea6620f 100644
--- a/prow/cmd/deck/static/labels.css
+++ b/prow/cmd/deck/static/labels.css
@@ -513,6 +513,11 @@
    color: #000000;
}

+.areax00002fconformance {
+    background-color: #0052cc;
+    color: #ffffff;
+}
+
.areax00002fboskos {
    background-color: #0052cc;
    color: #ffffff;
@@ -703,9 +708,4 @@
    color: #000000;
}

-.areax00002fconformance {
-    background-color: #0052cc;
-    color: #ffffff;
-}
-

/override pull-test-infra-verify-labels

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.

@justaugustus
Copy link
Member Author

Label CSS is fixed in #9633

@justaugustus
Copy link
Member Author

With KEP-1a merged, this is ready to go as well.

@spiffxp
Copy link
Member

spiffxp commented Oct 1, 2018

/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 Oct 1, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justaugustus, spiffxp

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 Oct 1, 2018
@spiffxp
Copy link
Member

spiffxp commented Oct 1, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2018
@k8s-ci-robot k8s-ci-robot merged commit 16f1ab8 into kubernetes:master Oct 1, 2018
@k8s-ci-robot
Copy link
Contributor

@justaugustus: Updated the label-config configmap using the following files:

  • key labels.yaml using file label_sync/labels.yaml

In response to this:

/sig pm architecture

rel:

Signed-off-by: Stephen Augustus [email protected]

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.

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/label_sync Issues or PRs related to code in /label_sync area/prow/deck Issues or PRs related to prow's deck component area/prow Issues or PRs related to prow 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. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants