Merge branch 'master' into conformance-project-board

5 files changed, 15 insertions, 10 deletions

diff --git a/contributors/design-proposals/api-machinery/aggregated-api-servers.md b/contributors/design-proposals/api-machinery/aggregated-api-servers.md
index 3c3310b0..fdddddee 100644
--- a/contributors/design-proposals/api-machinery/aggregated-api-servers.md
+++ b/contributors/design-proposals/api-machinery/aggregated-api-servers.md
@@ -210,7 +210,7 @@ API for all these operations.
 
 While deleting a namespace, kubernetes server needs to ensure that resources in
 that namespace maintained by other servers are deleted as well. We can do this
-using resource [finalizers](namespaces.md#finalizers). Each server
+using resource [finalizers](/contributors/design-proposals/architecture/namespaces.md#finalizers). Each server
 will add themselves in the set of finalizers before they create a resource in
 the corresponding namespace and delete all their resources in that namespace,
 whenever it is to be deleted (kubernetes API server already has this code, we
@@ -221,8 +221,8 @@ mechanism.
 
 #### Limit ranges and resource quotas
 
-kubernetes server maintains [resource quotas](admission_control_resource_quota.md) and
-[limit ranges](admission_control_limit_range.md) for all resources.
+kubernetes server maintains [resource quotas](/contributors/design-proposals/resource-management/admission_control_resource_quota.md) and
+[limit ranges](/contributors/design-proposals/resource-management/admission_control_limit_range.md) for all resources.
 Aggregated servers will need to check with the kubernetes server before creating any
 resource.
 
diff --git a/contributors/devel/development.md b/contributors/devel/development.md
index c2bee309..c9e5ac60 100644
--- a/contributors/devel/development.md
+++ b/contributors/devel/development.md
@@ -138,7 +138,8 @@ development environment, please [set one up](http://golang.org/doc/code.html).
 | 1.11           | 1.10.2      |
 | 1.12           | 1.10.4      |
 | 1.13           | 1.11.2      |
-| 1.13+          | 1.11.4      |
+| 1.13           | 1.11.4      |
+| 1.14+          | 1.12.1      |
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go
 environment instructions.
@@ -150,9 +151,10 @@ images.
 
 - The image for cross compiling in [build/build-image/cross].
   The `VERSION` file and `Dockerfile`.
-- Update the desired Go version in Dockerfile for the [e2e][e2e-image] and [test][test-image].
-  This requires pushing the [e2e][e2e-image] and [test][test-image] images that are `FROM` the desired Go version.
 - The cross tag `KUBE_BUILD_IMAGE_CROSS_TAG` in [build/common.sh].
+- The `go_version` in the [`go_register_toolchains`](https://git.k8s.io/kubernetes/build/root/WORKSPACE) bazel rule.
+- The desired Go verion in
+  [test/images/Makefile](https://git.k8s.io/kubernetes/test/images/Makefile).
 
 ### Quick Start
 
@@ -269,7 +271,6 @@ To check out code to work on, please refer to [this guide](/contributors/guide/g
 [macOS GNU tools]: https://www.topbug.net/blog/2013/04/14/install-and-use-gnu-command-line-tools-in-mac-os-x
 [build/build-image/cross]: https://git.k8s.io/kubernetes/build/build-image/cross
 [build/common.sh]: https://git.k8s.io/kubernetes/build/common.sh
-[e2e-image]: https://git.k8s.io/test-infra/jenkins/e2e-image
 [etcd-latest]: https://coreos.com/etcd/docs/latest
 [etcd-install]: sig-testing/integration-tests.md#install-etcd-dependency
 <!-- https://github.com/coreos/etcd/releases -->
@@ -278,5 +279,4 @@ To check out code to work on, please refer to [this guide](/contributors/guide/g
 [kubectl user guide]: https://kubernetes.io/docs/user-guide/kubectl
 [kubernetes.io]: https://kubernetes.io
 [mercurial]: http://mercurial.selenic.com/wiki/Download
-[test-image]: https://git.k8s.io/test-infra/jenkins/test-image
 [Build with Bazel]: sig-testing/bazel.md
diff --git a/contributors/devel/sig-architecture/conformance-tests.md b/contributors/devel/sig-architecture/conformance-tests.md
index 91ac862b..adc0f3e9 100644
--- a/contributors/devel/sig-architecture/conformance-tests.md
+++ b/contributors/devel/sig-architecture/conformance-tests.md
@@ -48,6 +48,11 @@ specifically, a test is eligible for promotion to conformance if:
   the [conformance test version skew policy]
 - it is stable and runs consistently (e.g., no flakes), and has been running
   for at least one release cycle
+- new conformance tests or updates to conformance tests for additional scenarios
+  are only allowed before code freeze dates set by the release team to allow
+  enough soak time of the changes and gives folks a chance to kick the tires
+  either in the community CI or their own infrastructure to make sure the tests
+  are robust
 
 Examples of features which are not currently eligible for conformance tests:
 
diff --git a/sig-api-machinery/README.md b/sig-api-machinery/README.md
index ab6e43d5..db286efa 100644
--- a/sig-api-machinery/README.md
+++ b/sig-api-machinery/README.md
@@ -13,7 +13,7 @@ Covers all aspects of API server, API registration and discovery, generic API CR
 ## Meetings
 * Regular SIG Meeting: [Wednesdays at 11:00 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=11:00&tz=PT%20%28Pacific%20Time%29).
   * [Meeting notes and Agenda](https://goo.gl/0lbiM9).
-  * [Meeting recordings](https://www.youtube.com/watch?v=Lj1ScbXpnpY&list=PL69nYSiGNLP21oW3hbLyjjj4XhrwKxH2R).
+  * [Meeting recordings](https://www.youtube.com/playlist?list=PL69nYSiGNLP21oW3hbLyjjj4XhrwKxH2R).
 * Kubebuilder and Controller Runtime Meeting: [Wednesdays at 10:00 PT (Pacific Time)]() (monthly - second Wednesday every month). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=10:00&tz=PT%20%28Pacific%20Time%29).
 
 ## Leadership
diff --git a/sigs.yaml b/sigs.yaml
index d5305867..14d01f3a 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -24,7 +24,7 @@ sigs:
       frequency: biweekly
       url: https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit
       archive_url: https://goo.gl/0lbiM9
-      recordings_url: https://www.youtube.com/watch?v=Lj1ScbXpnpY&list=PL69nYSiGNLP21oW3hbLyjjj4XhrwKxH2R
+      recordings_url: https://www.youtube.com/playlist?list=PL69nYSiGNLP21oW3hbLyjjj4XhrwKxH2R
     - description: Kubebuilder and Controller Runtime Meeting
       day: Wednesday
       time: "10:00"