diff --git a/contributors/devel/sig-node/container-runtime-interface.md b/contributors/devel/sig-node/container-runtime-interface.md index 3941c942645..38881da5306 100644 --- a/contributors/devel/sig-node/container-runtime-interface.md +++ b/contributors/devel/sig-node/container-runtime-interface.md @@ -58,12 +58,12 @@ proposals. We are working on adding more documentation for the API. - [Exec/attach/port-forward streaming requests](https://docs.google.com/document/d/1OE_QoInPlVCK9rMAx9aybRmgFiVjHpJCHI9LrfdNM_s/edit?usp=sharing) - [Container stdout/stderr logs](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/proposals/kubelet-cri-logging.md) -## Work-In-Progress CRI runtimes +## CRI runtimes - - [cri-o](https://github.com/kubernetes-incubator/cri-o) - - [rktlet](https://github.com/kubernetes-incubator/rktlet) + - [cri-o](https://github.com/cri-o/cri-o) + - [rktlet](https://github.com/kubernetes-retired/rktlet) - [frakti](https://github.com/kubernetes/frakti) - - [cri-containerd](https://github.com/kubernetes-incubator/cri-containerd) + - [cri-containerd](https://github.com/containerd/cri) - [singularity-cri](https://github.com/sylabs/singularity-cri) ## [Status update](#status-update) diff --git a/github-management/README.md b/github-management/README.md index 8ccb566b990..ba5024e25f5 100644 --- a/github-management/README.md +++ b/github-management/README.md @@ -72,7 +72,6 @@ project | [kubernetes](https://github.com/kubernetes) | Core | | [kubernetes-client](https://github.com/kubernetes-client) | API Client Libraries | | [kubernetes-csi](https://github.com/kubernetes-csi) | Container Storage Interface Components | -| [kubernetes-incubator](https://github.com/kubernetes-incubator) | Legacy Incubator Projects | | [kubernetes-retired](https://github.com/kubernetes-retired) | Retired/Archived Projects | | [kubernetes-security](https://github.com/kubernetes-security) | Private Security Fix Mirror | | [kubernetes-sigs](https://github.com/kubernetes-sigs) | SIG-related Projects | @@ -86,6 +85,7 @@ project | [kubernetes-extensions](https://github.com/kubernetes-extensions) | | | [kubernetes-federation](https://github.com/kubernetes-federation) | | | [kubernetes-graveyard](https://github.com/kubernetes-graveyard) | kubernetes-retired should be used instead going forward | +| [kubernetes-incubator](https://github.com/kubernetes-incubator) | Earlier used for legacy incubator projects | | [kubernetes-incubator-retired](https://github.com/kubernetes-incubator-retired) | kubernetes-retired should be used instead going forward | | [kubernetes-providers](https://github.com/kubernetes-providers) | | | [kubernetes-sidecars](https://github.com/kubernetes-sidecars) | | diff --git a/github-management/kubernetes-repositories.md b/github-management/kubernetes-repositories.md index c6b074f4a41..e326bc1143a 100644 --- a/github-management/kubernetes-repositories.md +++ b/github-management/kubernetes-repositories.md @@ -164,25 +164,6 @@ circumstances (e.g. a code of conduct violation). ## FAQ -**My project is currently in kubernetes-incubator, what is going to happen to -it?** - -Nothing. We’ll grandfather existing projects and they can stay in the incubator -org for as long as they want to. We expect/hope that most projects will either -move out to ecosystem, or into SIG or Core repositories following the same -approval process described below. - -**My project wants to graduate from incubator, how can it do that?** - -Either approval from a SIG to graduate to a SIG repository, or approval from -SIG-Architecture to graduate into the core repository. - -**My incubator project wants to go GA, how can it do that?** - -For now, the project determines if and when it is GA. For the future, we may -define a cross Kubernetes notion of GA for core and sig repositories, but that’s -not in this proposal. - **My project is currently in core, but doesn’t seem to fit these guidelines, what’s going to happen?** diff --git a/github-management/new-membership-procedure.md b/github-management/new-membership-procedure.md index f48f1df067d..ce844d1c1fd 100644 --- a/github-management/new-membership-procedure.md +++ b/github-management/new-membership-procedure.md @@ -47,7 +47,7 @@ required to be eligible to sponsor a new member. These requirements are: - Sponsors must be a member of the org they are attempting to sponsor for. - For example, if the membership being requested is for kubernetes-incubator, + For example, if the membership being requested is for kubernetes-sigs, then the sponsor should be a member of either that org, or main Kubernetes org (as members of the main org have implicit membership in other orgs). diff --git a/github-management/org-owners-guide.md b/github-management/org-owners-guide.md index 272c7cea680..ea284b528c3 100644 --- a/github-management/org-owners-guide.md +++ b/github-management/org-owners-guide.md @@ -75,9 +75,6 @@ for all orgs going forward. Notable discrepancies at the moment: `kubernetes-sig-foo-pr-reviews` teams and are intended mostly as a fallback notification mechanism when requested reviewers are being unresponsive. Ideally OWNERS files can be used in lieu of these teams. -- `admins-foo` and `maintainers-foo` teams as used by the kubernetes-incubator - org. This was a mistake that swapped the usual convention, and we would like - to rename the team ### Structure and Process diff --git a/sig-cluster-lifecycle/README.md b/sig-cluster-lifecycle/README.md index 21c0995d5b9..c07fd08cc27 100644 --- a/sig-cluster-lifecycle/README.md +++ b/sig-cluster-lifecycle/README.md @@ -139,11 +139,6 @@ The following [subprojects][subproject-definition] are owned by sig-cluster-life - **Meetings:** - kops Office Hours: [Fridays at 09:00 PT (Pacific Time)](https://zoom.us/j/97072789944?pwd=VVlUR3dhN2h5TEFQZHZTVVd4SnJUdz09) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=09:00&tz=PT%20%28Pacific%20Time%29). - [Meeting notes and Agenda](https://docs.google.com/document/d/12QkyL0FkNbWPcLFxxRGSPt_tNPBHbmni3YLY-lHny7E/edit). -### kube-aws -- **Owners:** - - https://raw.githubusercontent.com/kubernetes-incubator/kube-aws/master/OWNERS -- **Contact:** - - Slack: [#kube-aws](https://kubernetes.slack.com/messages/kube-aws) ### kube-up - **Owners:** - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/OWNERS diff --git a/sig-instrumentation/charter.md b/sig-instrumentation/charter.md index 2de868beff2..45602991bb8 100644 --- a/sig-instrumentation/charter.md +++ b/sig-instrumentation/charter.md @@ -28,8 +28,8 @@ APIs). [List of subprojects](https://github.com/kubernetes/community/tree/master/sig-instrumentation#subprojects) -- Components required for any Kubernetes cluster in regards to observability. Also referred to as the [core metrics pipeline][core-metrics-pipeline], meaning metrics that are to be consumed by the scheduler, kubectl and autoscaling. ([kubernetes-incubator/metrics-server](https://github.com/kubernetes-incubator/metrics-server), [kubernetes/heapster](https://github.com/kubernetes/heapster)) -- Interfaces/API definitions required for any Kubernetes cluster in regards to observability. These the APIs defined in order to interface external system (such as Prometheus, Stackdriver, etc.) to be exposed to Kubernetes as a common interface, in order for Kubernetes to be able to treat metric sources as a generic metrics API. ([kubernetes/metrics](https://github.com/kubernetes/metrics), [kubernetes-incubator/custom-metrics-apiserver](https://github.com/kubernetes-incubator/custom-metrics-apiserver)) +- Components required for any Kubernetes cluster in regards to observability. Also referred to as the [core metrics pipeline][core-metrics-pipeline], meaning metrics that are to be consumed by the scheduler, kubectl and autoscaling. ([kubernetes-sigs/metrics-server](https://github.com/kubernetes-sigs/metrics-server), [kubernetes/heapster](https://github.com/kubernetes/heapster)) +- Interfaces/API definitions required for any Kubernetes cluster in regards to observability. These the APIs defined in order to interface external system (such as Prometheus, Stackdriver, etc.) to be exposed to Kubernetes as a common interface, in order for Kubernetes to be able to treat metric sources as a generic metrics API. ([kubernetes/metrics](https://github.com/kubernetes/metrics), [kubernetes-sigs/custom-metrics-apiserver](https://github.com/kubernetes-sigs/custom-metrics-apiserver)) - Well established but optional components or adapters for Kubernetes clusters, if endorsed by members. Each component must have two or more members as maintainers. ([kubernetes/kube-state-metrics](https://github.com/kubernetes/kube-state-metrics), not yet officially owned by SIG-Instrumentation, but an example prospect for this category: [DirectXMan12/k8s-prometheus-adapter](https://github.com/DirectXMan12/k8s-prometheus-adapter)) #### Cross-cutting and Externally Facing Processes diff --git a/sig-service-catalog/charter.md b/sig-service-catalog/charter.md index 6ecd0dfef0c..39852e24ef4 100644 --- a/sig-service-catalog/charter.md +++ b/sig-service-catalog/charter.md @@ -25,8 +25,8 @@ This SIG’s main goals are: ### Code, Binaries and services -- [Source Repository](https://github.com/kubernetes-incubator/service-catalog) - - See [OWNERS](https://raw.githubusercontent.com/kubernetes-incubator/service-catalog/master/OWNERS) for who has access. +- [Source Repository](https://github.com/kubernetes-sigs/service-catalog) + - See [OWNERS](https://raw.githubusercontent.com/kubernetes-sigs/service-catalog/master/OWNERS) for who has access. - [Image Repository](https://quay.io/organization/kubernetes-service-catalog) - Canary builds are published on pushes to master. - Release builds (and latest) are published on tags. @@ -44,7 +44,7 @@ This SIG’s main goals are: - Files hosted on Azure blob storage. - Azure account managed by Carolyn Van Slyck (Microsoft) and Aaron Schlesinger (Microsoft). -- [Travis](https://travis-ci.org/kubernetes-incubator/service-catalog) +- [Travis](https://travis-ci.org/kubernetes-sigs/service-catalog) - Runs the CI builds. - Maintainers have access. - [Jenkins](https://service-catalog-jenkins.appspot.com/) @@ -61,7 +61,7 @@ This SIG's charter deviates from the [sig-governance](https://github.com/kubernetes/community/blob/master/committee-steering/governance/sig-governance.md) roles. We do not have the Tech Lead role, and have a honorary Emeritus Chair role. -- [Maintainers](https://github.com/orgs/kubernetes-incubator/teams/maintainers-service-catalog/members) +- [Maintainers](https://github.com/orgs/kubernetes-sigs/teams/service-catalog-maintainers/members) - Maintainer is equivalent to the standard [Kubernetes definition of Approver](https://github.com/kubernetes/community/blob/master/community-membership.md#approver). - Responsible for reviewing pull requests, and approving pull requests for merge. @@ -115,7 +115,7 @@ roles. We do not have the Tech Lead role, and have a honorary Emeritus Chair rol - Must accept and adhere to the Kubernetes [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy). - Defined in - [SECURITY_CONTACTS](https://github.com/kubernetes-incubator/service-catalog/blob/master/SECURITY_CONTACTS) + [SECURITY_CONTACTS](https://github.com/kubernetes-sigs/service-catalog/blob/master/SECURITY_CONTACTS) file. ## Organizational management @@ -129,7 +129,7 @@ roles. We do not have the Tech Lead role, and have a honorary Emeritus Chair rol reports, deep dives, etc.) should make their slides available for perusal and feedback at least 2 week in advance. - [Working - groups](https://github.com/kubernetes-incubator/service-catalog/wiki/Working-Groups) + groups](https://github.com/kubernetes-sigs/service-catalog/wiki/Working-Groups) can be initiated by any member. To create a new one, add the topic to the weekly call’s agenda for discussion. - These are not the same as cross-SIG working groups. @@ -137,7 +137,7 @@ roles. We do not have the Tech Lead role, and have a honorary Emeritus Chair rol members can meet to discuss and solve problems for our SIG. ### Project management -- [Milestones](https://github.com/kubernetes-incubator/service-catalog/milestones) +- [Milestones](https://github.com/kubernetes-sigs/service-catalog/milestones) are defined by SIG maintainers. - Anyone is free to request a discussion of the milestones/plans during a weekly call. @@ -147,7 +147,7 @@ roles. We do not have the Tech Lead role, and have a honorary Emeritus Chair rol - Major releases are planned and discussed among the SIG members during regular weekly calls. - The release process is defined - [here](https://github.com/kubernetes-incubator/service-catalog/wiki/Release-Process). + [here](https://github.com/kubernetes-sigs/service-catalog/wiki/Release-Process). - Anyone can request to work on an issue by commenting on it with `#dibs`. diff --git a/sigs.yaml b/sigs.yaml index 8de385bd5ec..15d78a59da7 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -1024,11 +1024,6 @@ sigs: frequency: biweekly url: https://zoom.us/j/97072789944?pwd=VVlUR3dhN2h5TEFQZHZTVVd4SnJUdz09 archive_url: https://docs.google.com/document/d/12QkyL0FkNbWPcLFxxRGSPt_tNPBHbmni3YLY-lHny7E/edit - - name: kube-aws - contact: - slack: kube-aws - owners: - - https://raw.githubusercontent.com/kubernetes-incubator/kube-aws/master/OWNERS - name: kube-up owners: - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/OWNERS