Merge branch 'master' into mcs-updates

Author: JeremyOT

SECURITY.md

@@ -0,0 +1,22 @@
+# Security Policy
+
+## Security Announcements
+
+Join the [kubernetes-security-announce] group for security and vulnerability announcements.
+
+You can also subscribe to an RSS feed of the above using [this link][kubernetes-security-announce-rss].
+
+## Reporting a Vulnerability
+
+Instructions for reporting a vulnerability can be found on the
+[Kubernetes Security and Disclosure Information] page.
+
+## Supported Versions
+
+Information about supported Kubernetes versions can be found on the
+[Kubernetes version and version skew support policy] page on the Kubernetes website.
+
+[kubernetes-security-announce]: https://groups.google.com/forum/#!forum/kubernetes-security-announce
+[kubernetes-security-announce-rss]: https://groups.google.com/forum/feed/kubernetes-security-announce/msgs/rss_v2_0.xml?num=50
+[Kubernetes version and version skew support policy]: https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions
+[Kubernetes Security and Disclosure Information]: https://kubernetes.io/docs/reference/issues-security/security/#report-a-vulnerability

keps/0001-kubernetes-enhancement-proposal-process.md

@@ -144,9 +144,7 @@ These KEPs will be owned by SIG-architecture and should be seen as a way to comm
 
 ### KEP Template
 
-<b>
-The template for a KEP is precisely defined [here](/keps/NNNN-kep-template).
-</b>
+**The template for a KEP is precisely defined [here](/keps/NNNN-kep-template).**
 
 ### KEP Metadata
 

keps/sig-api-machinery/20190711-remove-selflink.md renamed to keps/sig-api-machinery/1164-remove-selflink/README.md

@@ -1,23 +1,4 @@
----
-title: Deprecate and remove SelfLink
-authors:
-  - "@wojtek-t"
-owning-sig: sig-api-machinery
-participating-sigs:
-  - sig-scalability
-reviewers:
-  - "@liggitt"
-  - "@smarterclayton"
-approvers:
-  - "@lavalamp"
-  - "@deads2k"
-editor: "@wojtek-t"
-creation-date: 2019-07-11
-last-updated: 2019-07-24
-status: implementable
----
-
-# Deprecate and Remove SelfLink
+# KEP-1164: Deprecate and Remove SelfLink
 
 ## Table of Contents
 

keps/sig-api-machinery/1164-remove-selflink/kep.yaml

@@ -0,0 +1,39 @@
+title: Deprecate and remove SelfLink
+kep-number: 1164
+authors:
+  - "@wojtek-t"
+owning-sig: sig-api-machinery
+participating-sigs:
+  - sig-scalability
+reviewers:
+  - "@liggitt"
+  - "@smarterclayton"
+approvers:
+  - "@lavalamp"
+  - "@deads2k"
+creation-date: 2019-07-11
+last-updated: 2019-07-24
+status: implementable
+
+# The target maturity stage in the current dev cycle for this KEP.
+stage: alpha
+
+# The most recent milestone for which work toward delivery of this KEP has been
+# done. This can be the current (upcoming) milestone, if it is being actively
+# worked on.
+latest-milestone: "v1.19"
+
+# The milestone at which this feature was, or is targeted to be, at each stage.
+milestone:
+  alpha: "v1.16"
+  beta: "v1.20"
+  stable: "v1.21"
+
+# The following PRR answers are required at alpha release
+# List the feature gate name and the components for which it must be enabled
+feature-gates:
+  - name: RemoveSelfLink
+    components:
+    - kube-apiserver
+
+disable-supported: true