Revert "Redo v1.4.0-alpha.0"

This reverts commit c7f1485e1b, reversing
changes made to 939ad4115a.
This commit is contained in:
Zach Loafman
2016-06-14 09:01:53 -07:00
parent c7f1485e1b
commit f49c976bea
406 changed files with 10393 additions and 2979 deletions

View File

@@ -1,5 +1,34 @@
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- BEGIN STRIP_FOR_RELEASE -->
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
width="25" height="25">
<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
If you are using a released version of Kubernetes, you should
refer to the docs that go with that version.
<!-- TAG RELEASE_LINK, added by the munger automatically -->
<strong>
The latest release of this document can be found
[here](http://releases.k8s.io/release-1.2/docs/proposals/security-context-constraints.md).
Documentation for other releases can be found at
[releases.k8s.io](http://releases.k8s.io).
</strong>
--
<!-- END STRIP_FOR_RELEASE -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
@@ -131,39 +160,39 @@ type HostPortRange struct {
// VolumeSecurityPolicy allows and disallows the use of different types of volume plugins.
type VolumeSecurityPolicy struct {
// HostPath allows or disallows the use of the HostPath volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#hostpath
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#hostpath
HostPath bool `json:"hostPath,omitempty"`
// EmptyDir allows or disallows the use of the EmptyDir volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#emptydir
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#emptydir
EmptyDir bool `json:"emptyDir,omitempty"`
// GCEPersistentDisk allows or disallows the use of the GCEPersistentDisk volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#gcepersistentdisk
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk
GCEPersistentDisk bool `json:"gcePersistentDisk,omitempty"`
// AWSElasticBlockStore allows or disallows the use of the AWSElasticBlockStore volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#awselasticblockstore
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore
AWSElasticBlockStore bool `json:"awsElasticBlockStore,omitempty"`
// GitRepo allows or disallows the use of the GitRepo volume plugin.
GitRepo bool `json:"gitRepo,omitempty"`
// Secret allows or disallows the use of the Secret volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#secrets
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#secrets
Secret bool `json:"secret,omitempty"`
// NFS allows or disallows the use of the NFS volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/volumes.md#nfs
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#nfs
NFS bool `json:"nfs,omitempty"`
// ISCSI allows or disallows the use of the ISCSI volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/examples/iscsi/README.md
// More info: http://releases.k8s.io/HEAD/examples/iscsi/README.md
ISCSI bool `json:"iscsi,omitempty"`
// Glusterfs allows or disallows the use of the Glusterfs volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/examples/glusterfs/README.md
// More info: http://releases.k8s.io/HEAD/examples/glusterfs/README.md
Glusterfs bool `json:"glusterfs,omitempty"`
// PersistentVolumeClaim allows or disallows the use of the PersistentVolumeClaim volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/user-guide/persistent-volumes.md#persistentvolumeclaims
// More info: http://releases.k8s.io/HEAD/docs/user-guide/persistent-volumes.md#persistentvolumeclaims
PersistentVolumeClaim bool `json:"persistentVolumeClaim,omitempty"`
// RBD allows or disallows the use of the RBD volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/examples/rbd/README.md
// More info: http://releases.k8s.io/HEAD/examples/rbd/README.md
RBD bool `json:"rbd,omitempty"`
// Cinder allows or disallows the use of the Cinder volume plugin.
// More info: http://releases.k8s.io/v1.4.0-alpha.0/examples/mysql-cinder-pd/README.md
// More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md
Cinder bool `json:"cinder,omitempty"`
// CephFS allows or disallows the use of the CephFS volume plugin.
CephFS bool `json:"cephfs,omitempty"`
@@ -178,7 +207,7 @@ type SELinuxContextStrategyOptions struct {
// Type is the strategy that will dictate the allowable labels that may be set.
Type SELinuxContextStrategy `json:"type"`
// seLinuxOptions required to run as; required for MustRunAs
// More info: http://releases.k8s.io/v1.4.0-alpha.0/docs/design/security_context.md#security-context
// More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context
SELinuxOptions *api.SELinuxOptions `json:"seLinuxOptions,omitempty"`
}
@@ -348,13 +377,6 @@ it should still admit the pod and allow the Kubelet to ensure that the image doe
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/security-context-constraints.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->