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

Remove config and references to kubernetes-incubator #19409

Merged
merged 1 commit into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config/jobs/kubernetes/test-infra/fejta-bot-periodics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ periodics:
- |-
--query=org:kubernetes
org:kubernetes-sigs
org:kubernetes-incubator
org:kubernetes-client
org:kubernetes-csi
is:pr
Expand Down Expand Up @@ -102,7 +101,6 @@ periodics:
- |-
--query=org:kubernetes
org:kubernetes-sigs
org:kubernetes-incubator
org:kubernetes-client
org:kubernetes-csi
-label:lifecycle/frozen
Expand Down Expand Up @@ -199,7 +197,6 @@ periodics:
- |-
--query=org:kubernetes
org:kubernetes-sigs
org:kubernetes-incubator
org:kubernetes-client
org:kubernetes-csi
-label:lifecycle/frozen
Expand Down Expand Up @@ -243,7 +240,6 @@ periodics:
- |-
--query=org:kubernetes
org:kubernetes-sigs
org:kubernetes-incubator
org:kubernetes-client
org:kubernetes-csi
-label:lifecycle/frozen
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ periodics:
args:
- --config=/etc/config/labels.yaml
- --confirm=true
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-incubator,kubernetes-sigs
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-sigs
- --token=/etc/github/oauth
- --endpoint=http://ghproxy.default.svc.cluster.local
- --endpoint=https://api.github.com
Expand Down
15 changes: 0 additions & 15 deletions config/prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -384,20 +384,6 @@ branch-protection:
- "^revert-" # don't protect revert branches
- "^dependabot/" # don't protect branches created by dependabot
- "^greenkeeper/" # don't protect branches created by greenkeeper
kubernetes-incubator:
protect: true
required_status_checks:
contexts:
- cla/linuxfoundation
exclude:
- "^revert-" # don't protect revert branches
- "^dependabot/" # don't protect branches created by dependabot
- "^greenkeeper/" # don't protect branches created by greenkeeper
repos:
kube-aws:
required_status_checks:
contexts:
- continuous-integration/travis-ci
kubernetes-sigs:
protect: true
required_status_checks:
Expand Down Expand Up @@ -461,7 +447,6 @@ tide:
- kubernetes
- kubernetes-client
- kubernetes-csi
- kubernetes-incubator
- kubernetes-sigs
excludedRepos:
- kubernetes/kubernetes # Handled with a separate Tide query below.
Expand Down
34 changes: 0 additions & 34 deletions config/prow/plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ triggers:
- kubernetes
- kubernetes-client
- kubernetes-csi
- kubernetes-incubator
- kubernetes-sigs
join_org_url: "https://git.k8s.io/community/community-membership.md#member"
only_org_members: true
Expand Down Expand Up @@ -480,7 +479,6 @@ welcome:
- kubernetes
- kubernetes-client
- kubernetes-csi
- kubernetes-incubator
- kubernetes-sigs
message_template: "Welcome @{{.AuthorLogin}}! <br><br>It looks like this is your first PR to <a href='https://github.com/{{.Org}}/{{.Repo}}'>{{.Org}}/{{.Repo}}</a> 🎉. Please refer to our [pull request process documentation](https://git.k8s.io/community/contributors/guide/pull-requests.md) to help your PR have a smooth ride to approval. <br><br>You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. [Here is the bot commands documentation](https://go.k8s.io/bot-commands). <br><br>You can also check if {{.Org}}/{{.Repo}} has [its own contribution guidelines](https://github.com/{{.Org}}/{{.Repo}}/tree/master/CONTRIBUTING.md). <br><br>You may want to refer to our [testing guide](https://git.k8s.io/community/contributors/devel/sig-testing/testing.md) if you run into trouble with your tests not passing. <br><br>If you are having difficulty getting your pull request seen, please follow the [recommended escalation practices](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#why-is-my-pull-request-not-getting-reviewed). Also, for tips and tricks in the contribution process you may want to read the [Kubernetes contributor cheat sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet/README.md). We want to make sure your contribution gets all the attention it needs! <br><br>Thank you, and welcome to Kubernetes. :smiley:"

Expand Down Expand Up @@ -816,33 +814,6 @@ plugins:
- wip
- yuks

kubernetes-incubator:
- approve
- assign
- blunderbuss
- cat
- cla
- dog
- goose
- heart
- help
- hold
- invalidcommitmsg
- label
- lgtm
- lifecycle
- owners-label
- pony
- retitle
- shrug
- size
- skip
- trigger
- verify-owners
- welcome
- wip
- yuks

kubernetes-sigs:
- approve
- assign
Expand Down Expand Up @@ -1017,8 +988,3 @@ external_plugins:
events:
- issue_comment
- pull_request
kubernetes-incubator:
- name: needs-rebase
events:
- issue_comment
- pull_request
2 changes: 1 addition & 1 deletion label_sync/cluster/label_sync_cron_job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
args:
- --config=/etc/config/labels.yaml
- --confirm=true
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-incubator,kubernetes-sigs
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-sigs
- --token=/etc/github/oauth
volumeMounts:
- name: oauth
Expand Down
2 changes: 1 addition & 1 deletion label_sync/cluster/label_sync_job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
args:
- --config=/etc/config/labels.yaml
- --confirm=true
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-incubator,kubernetes-sigs
- --orgs=kubernetes,kubernetes-client,kubernetes-csi,kubernetes-sigs
- --token=/etc/github/oauth
volumeMounts:
- name: oauth
Expand Down
4 changes: 2 additions & 2 deletions prow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ To see common Prow usage and interactions flow, see the pull request interaction

Prow is used by the following organizations and projects:
- [Kubernetes](https://prow.k8s.io)
- This includes [kubernetes](https://github.com/kubernetes), [kubernetes-client](https://github.com/kubernetes-client), [kubernetes-csi](https://github.com/kubernetes-csi), [kubernetes-incubator](https://github.com/kubernetes-incubator), and [kubernetes-sigs](https://github.com/kubernetes-sigs).
- This includes [kubernetes](https://github.com/kubernetes), [kubernetes-client](https://github.com/kubernetes-client), [kubernetes-csi](https://github.com/kubernetes-csi), and [kubernetes-sigs](https://github.com/kubernetes-sigs).
- [OpenShift](https://prow.svc.ci.openshift.org/)
- This includes [openshift](https://github.com/openshift), [openshift-s2i](https://github.com/openshift-s2i), [operator-framework](https://github.com/operator-framework), and some repos in [kubernetes-incubator](https://github.com/kubernetes-incubator), [containers](https://github.com/containers) and [heketi](https://github.com/heketi).
- This includes [openshift](https://github.com/openshift), [openshift-s2i](https://github.com/openshift-s2i), [operator-framework](https://github.com/operator-framework), and some repos in [containers](https://github.com/containers) and [heketi](https://github.com/heketi).
- [Istio](https://prow.istio.io/)
- [Knative](https://prow.knative.dev/)
- [Jetstack](https://prow.build-infra.jetstack.net/)
Expand Down
4 changes: 2 additions & 2 deletions prow/plugins/trigger/pull-request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestTrusted(t *testing.T) {
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
g := &fakegithub.FakeClient{
OrgMembers: map[string][]string{"kubernetes": {sister}, "kubernetes-incubator": {member, fakegithub.Bot}},
OrgMembers: map[string][]string{"kubernetes": {sister}, "kubernetes-sigs": {member, fakegithub.Bot}},
Collaborators: []string{friend},
IssueComments: map[int][]github.IssueComment{},
}
Expand All @@ -103,7 +103,7 @@ func TestTrusted(t *testing.T) {
Name: label,
})
}
_, actual, err := TrustedPullRequest(g, trigger, tc.author, "kubernetes-incubator", "random-repo", 1, labels)
_, actual, err := TrustedPullRequest(g, trigger, tc.author, "kubernetes-sigs", "random-repo", 1, labels)
if err != nil {
t.Fatalf("Didn't expect error: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion velodrome/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ convention used by velodrome:
- Project: A project describe a completely hermetic instance of the website for
a given team. A project can span across multiple organizations and multiple
repositories. e.g. The kubernetes project is made of repositories in the
`kubernetes` organization, and `kubernetes-incubator`.
`kubernetes` organization, and `kubernetes-sigs`.

Adding a new project
====================
Expand Down