From c39be4bc745663a40a2d358b2d611c9b475c1bd1 Mon Sep 17 00:00:00 2001 From: markturansky Date: Tue, 30 Jun 2015 15:23:37 -0400 Subject: [PATCH] Removed extraneous json desc --- pkg/api/types.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 5319af1917..4ef1ae4769 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -245,7 +245,7 @@ type PersistentVolumeSource struct { type PersistentVolumeClaimVolumeSource struct { // ClaimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume - ClaimName string `json:"claimName" description:"the name of the claim in the same namespace to be mounted as a volume"` + ClaimName string `json:"claimName"` // Optional: Defaults to false (read/write). ReadOnly here // will force the ReadOnly setting in VolumeMounts ReadOnly bool `json:"readOnly,omitempty"` @@ -274,7 +274,7 @@ type PersistentVolumeSpec struct { // claim.VolumeName is the authoritative bind between PV and PVC. ClaimRef *ObjectReference `json:"claimRef,omitempty"` // Optional: what happens to a persistent volume when released from its claim. - PersistentVolumeReclaimPolicy PersistentVolumeReclaimPolicy `json:"persistentVolumeReclaimPolicy,omitempty" description:"what happens to a volume when released from its claim; Valid options are Retain (default) and Recycle. Recyling must be supported by the volume plugin underlying this persistent volume."` + PersistentVolumeReclaimPolicy PersistentVolumeReclaimPolicy `json:"persistentVolumeReclaimPolicy,omitempty"` } // PersistentVolumeReclaimPolicy describes a policy for end-of-life maintenance of persistent volumes @@ -723,7 +723,7 @@ type Container struct { // Required: Policy for pulling images for this container ImagePullPolicy PullPolicy `json:"imagePullPolicy"` // Optional: SecurityContext defines the security options the pod should be run with - SecurityContext *SecurityContext `json:"securityContext,omitempty" description:"security options the pod should run with"` + SecurityContext *SecurityContext `json:"securityContext,omitempty"` } // Handler defines a specific action that should be taken @@ -919,7 +919,7 @@ type PodSpec struct { // ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. // If specified, these secrets will be passed to individual puller implementations for them to use. For example, // in the case of docker, only DockerConfig type secrets are honored. - ImagePullSecrets []LocalObjectReference `json:"imagePullSecrets,omitempty" description:"list of references to secrets in the same namespace available for pulling the container images"` + ImagePullSecrets []LocalObjectReference `json:"imagePullSecrets,omitempty"` } // PodStatus represents information about the status of a pod. Status may trail the actual @@ -930,7 +930,7 @@ type PodStatus struct { // A human readable message indicating details about why the pod is in this state. Message string `json:"message,omitempty"` // A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk' - Reason string `json:"reason,omitempty" description:"(brief-CamelCase) reason indicating details about why the pod is in this condition"` + Reason string `json:"reason,omitempty"` HostIP string `json:"hostIP,omitempty"` PodIP string `json:"podIP,omitempty"` @@ -1102,7 +1102,7 @@ type ServiceStatus struct { type LoadBalancerStatus struct { // Ingress is a list containing ingress points for the load-balancer; // traffic intended for the service should be sent to these ingress points. - Ingress []LoadBalancerIngress `json:"ingress,omitempty" description:"load-balancer ingress points"` + Ingress []LoadBalancerIngress `json:"ingress,omitempty"` } // LoadBalancerIngress represents the status of a load-balancer ingress point: @@ -1110,11 +1110,11 @@ type LoadBalancerStatus struct { type LoadBalancerIngress struct { // IP is set for load-balancer ingress points that are IP based // (typically GCE or OpenStack load-balancers) - IP string `json:"ip,omitempty" description:"IP address of ingress point"` + IP string `json:"ip,omitempty"` // Hostname is set for load-balancer ingress points that are DNS based // (typically AWS load-balancers) - Hostname string `json:"hostname,omitempty" description:"hostname of ingress point"` + Hostname string `json:"hostname,omitempty"` } // ServiceSpec describes the attributes that a user creates on a service @@ -1169,7 +1169,7 @@ type ServicePort struct { // The port on each node on which this service is exposed. // Default is to auto-allocate a port if the ServiceType of this Service requires one. - NodePort int `json:"nodePort" description:"the port on each node on which this service is exposed"` + NodePort int `json:"nodePort"` } // Service is a named abstraction of software service (for example, mysql) consisting of local port @@ -1200,7 +1200,7 @@ type ServiceAccount struct { // ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling any images // in pods that reference this ServiceAccount. ImagePullSecrets are distinct from Secrets because Secrets // can be mounted in the pod, but ImagePullSecrets are only accessed by the kubelet. - ImagePullSecrets []LocalObjectReference `json:"imagePullSecrets,omitempty" description:"list of references to secrets in the same namespace available for pulling container images"` + ImagePullSecrets []LocalObjectReference `json:"imagePullSecrets,omitempty"` } // ServiceAccountList is a list of ServiceAccount objects @@ -1784,7 +1784,7 @@ type LocalObjectReference struct { type SerializedReference struct { TypeMeta `json:",inline"` - Reference ObjectReference `json:"reference,omitempty" description:"the reference to an object in the system"` + Reference ObjectReference `json:"reference,omitempty"` } type EventSource struct { @@ -2075,32 +2075,32 @@ type ComponentStatusList struct { // both the Container AND the SecurityContext will result in an error. type SecurityContext struct { // Capabilities are the capabilities to add/drop when running the container - Capabilities *Capabilities `json:"capabilities,omitempty" description:"the linux capabilites that should be added or removed"` + Capabilities *Capabilities `json:"capabilities,omitempty"` // Run the container in privileged mode - Privileged *bool `json:"privileged,omitempty" description:"run the container in privileged mode"` + Privileged *bool `json:"privileged,omitempty"` // SELinuxOptions are the labels to be applied to the container // and volumes - SELinuxOptions *SELinuxOptions `json:"seLinuxOptions,omitempty" description:"options that control the SELinux labels applied"` + SELinuxOptions *SELinuxOptions `json:"seLinuxOptions,omitempty"` // RunAsUser is the UID to run the entrypoint of the container process. - RunAsUser *int64 `json:"runAsUser,omitempty" description:"the user id that runs the first process in the container"` + RunAsUser *int64 `json:"runAsUser,omitempty"` } // SELinuxOptions are the labels to be applied to the container. type SELinuxOptions struct { // SELinux user label - User string `json:"user,omitempty" description:"the user label to apply to the container"` + User string `json:"user,omitempty"` // SELinux role label - Role string `json:"role,omitempty" description:"the role label to apply to the container"` + Role string `json:"role,omitempty"` // SELinux type label - Type string `json:"type,omitempty" description:"the type label to apply to the container"` + Type string `json:"type,omitempty"` // SELinux level label. - Level string `json:"level,omitempty" description:"the level label to apply to the container"` + Level string `json:"level,omitempty"` } // RangeAllocation is an opaque API object (not exposed to end users) that can be persisted to record