github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Update 'More info' links on API types and fields

Browse Source 
Recent docs website shuffling during 1.6 caused majority of links in the API
types and fields to break. Since we do not have server-side 301 redirects, user
has to click an extra link and the #target segment in the URL will be lost.

I have manually gone through all of them to bring them up to date and add HTTPS
to those missing it.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
This commit is contained in:
Ahmet Alp Balkan
2017-04-13 15:52:53 -07:00
parent 51d6429a62
commit 893280d3e4
18 changed files with 294 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
federation/apis/federation/types.go
View File

@@ -98,7 +98,7 @@ type ClusterStatus struct {
type Cluster struct { type Cluster struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
@@ -114,7 +114,7 @@ type Cluster struct {
type ClusterList struct { type ClusterList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#types-kinds
// +optional // +optional
metav1.ListMeta metav1.ListMeta

4
federation/apis/federation/v1beta1/types.go
View File

@@ -99,7 +99,7 @@ type ClusterStatus struct {
type Cluster struct { type Cluster struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -115,7 +115,7 @@ type Cluster struct {
type ClusterList struct { type ClusterList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#types-kinds
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

12
pkg/api/types.go
View File

@@ -131,7 +131,7 @@ type ObjectMeta struct {
// //
// Populated by the system when a graceful deletion is requested. // Populated by the system when a graceful deletion is requested.
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
DeletionTimestamp *metav1.Time DeletionTimestamp *metav1.Time
@@ -507,7 +507,7 @@ type PersistentVolumeClaimSpec struct {
// +optional // +optional
VolumeName string VolumeName string
// Name of the StorageClass required by the claim. // Name of the StorageClass required by the claim.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#class-1 // More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class-1
// +optional // +optional
StorageClassName *string StorageClassName *string
} }
@@ -2221,7 +2221,7 @@ type PodStatus struct {
// The list has one entry per init container in the manifest. The most recent successful // The list has one entry per init container in the manifest. The most recent successful
// init container will have ready = true, the most recently started container will have // init container will have ready = true, the most recently started container will have
// startTime set. // startTime set.
// More info: http://kubernetes.io/docs/user-guide/pod-states#container-statuses // More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-and-container-status
InitContainerStatuses []ContainerStatus InitContainerStatuses []ContainerStatus
// The list has one entry per container in the manifest. Each entry is // The list has one entry per container in the manifest. Each entry is
// currently the output of `docker inspect`. This output format is *not* // currently the output of `docker inspect`. This output format is *not*
@@ -2508,7 +2508,7 @@ type ServiceSpec struct {
// "LoadBalancer" builds on NodePort and creates an // "LoadBalancer" builds on NodePort and creates an
// external load-balancer (if supported in the current cloud) which routes // external load-balancer (if supported in the current cloud) which routes
// to the clusterIP. // to the clusterIP.
// More info: http://kubernetes.io/docs/user-guide/services#overview // More info: https://kubernetes.io/docs/concepts/services-networking/service/
// +optional // +optional
Type ServiceType Type ServiceType
@@ -2520,7 +2520,7 @@ type ServiceSpec struct {
// external process managing its endpoints, which Kubernetes will not // external process managing its endpoints, which Kubernetes will not
// modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. // modify. Only applies to types ClusterIP, NodePort, and LoadBalancer.
// Ignored if type is ExternalName. // Ignored if type is ExternalName.
// More info: http://kubernetes.io/docs/user-guide/services#overview // More info: https://kubernetes.io/docs/concepts/services-networking/service/
Selector map[string]string Selector map[string]string
// ClusterIP is the IP address of the service and is usually assigned // ClusterIP is the IP address of the service and is usually assigned
@@ -2531,7 +2531,7 @@ type ServiceSpec struct {
// can be specified for headless services when proxying is not required. // can be specified for headless services when proxying is not required.
// Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if // Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if
// type is ExternalName. // type is ExternalName.
// More info: http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies // More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
// +optional // +optional
ClusterIP string ClusterIP string

6
pkg/api/unversioned/types.go
View File

@@ -28,14 +28,14 @@ type TypeMeta struct {
// Servers may infer this from the endpoint the client submits requests to. // Servers may infer this from the endpoint the client submits requests to.
// Cannot be updated. // Cannot be updated.
// In CamelCase. // In CamelCase.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#types-kinds
// +optional // +optional
Kind string `json:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"` Kind string `json:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"`
// APIVersion defines the versioned schema of this representation of an object. // APIVersion defines the versioned schema of this representation of an object.
// Servers should convert recognized schemas to the latest internal value, and // Servers should convert recognized schemas to the latest internal value, and
// may reject unrecognized values. // may reject unrecognized values.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#resources
// +optional // +optional
APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"` APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"`
} }
@@ -54,7 +54,7 @@ type ListMeta struct {
// Value must be treated as opaque by clients and passed unmodified back to the server. // Value must be treated as opaque by clients and passed unmodified back to the server.
// Populated by the system. // Populated by the system.
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#concurrency-control-and-consistency
// +optional // +optional
ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,2,opt,name=resourceVersion"` ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,2,opt,name=resourceVersion"`
} }

393
pkg/api/v1/types.go
View File

File diff suppressed because it is too large Load Diff

2
pkg/apis/apps/types.go
View File

@@ -56,7 +56,7 @@ type StatefulSetSpec struct {
// Selector is a label query over pods that should match the replica count. // Selector is a label query over pods that should match the replica count.
// If empty, defaulted to labels on the pod template. // If empty, defaulted to labels on the pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector Selector *metav1.LabelSelector

4
pkg/apis/apps/v1beta1/types.go
View File

@@ -48,7 +48,7 @@ type ScaleStatus struct {
// avoid introspection in the clients. The string will be in the same format as the // avoid introspection in the clients. The string will be in the same format as the
// query-param syntax. If the target type only supports map-based selectors, both this // query-param syntax. If the target type only supports map-based selectors, both this
// field and map-based selector field are populated. // field and map-based selector field are populated.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"` TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"`
} }
@@ -107,7 +107,7 @@ type StatefulSetSpec struct {
// Selector is a label query over pods that should match the replica count. // Selector is a label query over pods that should match the replica count.
// If empty, defaulted to labels on the pod template. // If empty, defaulted to labels on the pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"`

6
pkg/apis/autoscaling/types.go
View File

@@ -53,7 +53,7 @@ type ScaleStatus struct {
// label query over pods that should match the replicas count. This is same // label query over pods that should match the replicas count. This is same
// as the label selector but in the string format to avoid introspection // as the label selector but in the string format to avoid introspection
// by clients. The string will be in the same format as the query-param syntax. // by clients. The string will be in the same format as the query-param syntax.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector string Selector string
} }
@@ -279,12 +279,12 @@ type ResourceMetricStatus struct {
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
metav1.TypeMeta metav1.TypeMeta
// Metadata is the standard object metadata. // Metadata is the standard object metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// Spec is the specification for the behaviour of the autoscaler. // Spec is the specification for the behaviour of the autoscaler.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status.
// +optional // +optional
Spec HorizontalPodAutoscalerSpec Spec HorizontalPodAutoscalerSpec

4
pkg/apis/autoscaling/v2alpha1/types.go
View File

@@ -243,12 +243,12 @@ type ResourceMetricStatus struct {
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// metadata is the standard object metadata. // metadata is the standard object metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// spec is the specification for the behaviour of the autoscaler. // spec is the specification for the behaviour of the autoscaler.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status.
// +optional // +optional
Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`

22
pkg/apis/batch/types.go
View File

@@ -27,17 +27,17 @@ import (
type Job struct { type Job struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// Specification of the desired behavior of a job. // Specification of the desired behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec JobSpec Spec JobSpec
// Current status of a job. // Current status of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status JobStatus Status JobStatus
} }
@@ -46,7 +46,7 @@ type Job struct {
type JobList struct { type JobList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta
@@ -58,7 +58,7 @@ type JobList struct {
type JobTemplate struct { type JobTemplate struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
@@ -71,12 +71,12 @@ type JobTemplate struct {
// JobTemplateSpec describes the data a Job should have when created from a template // JobTemplateSpec describes the data a Job should have when created from a template
type JobTemplateSpec struct { type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template. // Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// Specification of the desired behavior of the job. // Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec JobSpec Spec JobSpec
} }
@@ -193,17 +193,17 @@ type JobCondition struct {
type CronJob struct { type CronJob struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// Specification of the desired behavior of a cron job, including the schedule. // Specification of the desired behavior of a cron job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec CronJobSpec Spec CronJobSpec
// Current status of a cron job. // Current status of a cron job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status CronJobStatus Status CronJobStatus
} }
@@ -212,7 +212,7 @@ type CronJob struct {
type CronJobList struct { type CronJobList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta

21
pkg/apis/batch/v1/types.go
View File

@@ -27,17 +27,17 @@ import (
type Job struct { type Job struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Specification of the desired behavior of a job. // Specification of the desired behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec JobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec JobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
// Current status of a job. // Current status of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status JobStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` Status JobStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
} }
@@ -46,7 +46,7 @@ type Job struct {
type JobList struct { type JobList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -61,7 +61,7 @@ type JobSpec struct {
// run at any given time. The actual number of pods running in steady state will // run at any given time. The actual number of pods running in steady state will
// be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism), // be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism),
// i.e. when the work left to do is less than max parallelism. // i.e. when the work left to do is less than max parallelism.
// More info: http://kubernetes.io/docs/user-guide/jobs // More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
// +optional // +optional
Parallelism *int32 `json:"parallelism,omitempty" protobuf:"varint,1,opt,name=parallelism"` Parallelism *int32 `json:"parallelism,omitempty" protobuf:"varint,1,opt,name=parallelism"`
@@ -70,7 +70,7 @@ type JobSpec struct {
// pod signals the success of all pods, and allows parallelism to have any positive // pod signals the success of all pods, and allows parallelism to have any positive
// value. Setting to 1 means that parallelism is limited to 1 and the success of that // value. Setting to 1 means that parallelism is limited to 1 and the success of that
// pod signals the success of the job. // pod signals the success of the job.
// More info: http://kubernetes.io/docs/user-guide/jobs // More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
// +optional // +optional
Completions *int32 `json:"completions,omitempty" protobuf:"varint,2,opt,name=completions"` Completions *int32 `json:"completions,omitempty" protobuf:"varint,2,opt,name=completions"`
@@ -81,7 +81,7 @@ type JobSpec struct {
// A label query over pods that should match the pod count. // A label query over pods that should match the pod count.
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"`
@@ -94,20 +94,19 @@ type JobSpec struct {
// and other jobs to not function correctly. However, You may see // and other jobs to not function correctly. However, You may see
// `manualSelector=true` in jobs that were created with the old `extensions/v1beta1` // `manualSelector=true` in jobs that were created with the old `extensions/v1beta1`
// API. // API.
// More info: http://releases.k8s.io/HEAD/docs/design/selector-generation.md // More info: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/selector-generation.md
// +optional // +optional
ManualSelector *bool `json:"manualSelector,omitempty" protobuf:"varint,5,opt,name=manualSelector"` ManualSelector *bool `json:"manualSelector,omitempty" protobuf:"varint,5,opt,name=manualSelector"`
// Describes the pod that will be created when executing a job. // Describes the pod that will be created when executing a job.
// More info: http://kubernetes.io/docs/user-guide/jobs // More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,6,opt,name=template"` Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,6,opt,name=template"`
} }
// JobStatus represents the current state of a Job. // JobStatus represents the current state of a Job.
type JobStatus struct { type JobStatus struct {
// The latest available observations of an object's current state. // The latest available observations of an object's current state.
// More info: http://kubernetes.io/docs/user-guide/jobs // More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
// +optional // +optional
// +patchMergeKey=type // +patchMergeKey=type
// +patchStrategy=merge // +patchStrategy=merge

15
pkg/apis/batch/v2alpha1/types.go
View File

@@ -26,7 +26,7 @@ import (
type JobTemplate struct { type JobTemplate struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -39,12 +39,12 @@ type JobTemplate struct {
// JobTemplateSpec describes the data a Job should have when created from a template // JobTemplateSpec describes the data a Job should have when created from a template
type JobTemplateSpec struct { type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template. // Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Specification of the desired behavior of the job. // Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec batchv1.JobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec batchv1.JobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
} }
@@ -55,17 +55,17 @@ type JobTemplateSpec struct {
type CronJob struct { type CronJob struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Specification of the desired behavior of a cron job, including the schedule. // Specification of the desired behavior of a cron job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec CronJobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec CronJobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
// Current status of a cron job. // Current status of a cron job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status CronJobStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` Status CronJobStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
} }
@@ -73,8 +73,9 @@ type CronJob struct {
// CronJobList is a collection of cron jobs. // CronJobList is a collection of cron jobs.
type CronJobList struct { type CronJobList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

28
pkg/apis/extensions/types.go
View File

@@ -56,7 +56,7 @@ type ScaleStatus struct {
Replicas int32 Replicas int32
// label query over pods that should match the replicas count. // label query over pods that should match the replicas count.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector Selector *metav1.LabelSelector
} }
@@ -421,7 +421,7 @@ type DaemonSetSpec struct {
// A label query over pods that are managed by the daemon set. // A label query over pods that are managed by the daemon set.
// Must match in order to be controlled. // Must match in order to be controlled.
// If empty, defaulted to labels on Pod template. // If empty, defaulted to labels on Pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector Selector *metav1.LabelSelector
@@ -429,7 +429,7 @@ type DaemonSetSpec struct {
// The DaemonSet will create exactly one copy of this pod on every node // The DaemonSet will create exactly one copy of this pod on every node
// that matches the template's node selector (or on every node if no node // that matches the template's node selector (or on every node if no node
// selector is specified). // selector is specified).
// More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template
Template api.PodTemplateSpec Template api.PodTemplateSpec
// An update strategy to replace existing DaemonSet pods with new pods. // An update strategy to replace existing DaemonSet pods with new pods.
@@ -494,12 +494,12 @@ type DaemonSetStatus struct {
type DaemonSet struct { type DaemonSet struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// The desired behavior of this daemon set. // The desired behavior of this daemon set.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec DaemonSetSpec Spec DaemonSetSpec
@@ -507,7 +507,7 @@ type DaemonSet struct {
// out of date by some window of time. // out of date by some window of time.
// Populated by the system. // Populated by the system.
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status DaemonSetStatus Status DaemonSetStatus
} }
@@ -523,7 +523,7 @@ const (
type DaemonSetList struct { type DaemonSetList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta
@@ -534,7 +534,7 @@ type DaemonSetList struct {
type ThirdPartyResourceDataList struct { type ThirdPartyResourceDataList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta
// Items is a list of third party objects // Items is a list of third party objects
@@ -550,17 +550,17 @@ type ThirdPartyResourceDataList struct {
type Ingress struct { type Ingress struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta metav1.ObjectMeta
// Spec is the desired state of the Ingress. // Spec is the desired state of the Ingress.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec IngressSpec Spec IngressSpec
// Status is the current state of the Ingress. // Status is the current state of the Ingress.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status IngressStatus Status IngressStatus
} }
@@ -569,7 +569,7 @@ type Ingress struct {
type IngressList struct { type IngressList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta
@@ -750,7 +750,7 @@ type ReplicaSetSpec struct {
// Selector is a label query over pods that should match the replica count. // Selector is a label query over pods that should match the replica count.
// Must match in order to be controlled. // Must match in order to be controlled.
// If empty, defaulted to labels on pod template. // If empty, defaulted to labels on pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector Selector *metav1.LabelSelector
@@ -927,7 +927,7 @@ type SELinuxStrategyOptions struct {
// Rule is the strategy that will dictate the allowable labels that may be set. // Rule is the strategy that will dictate the allowable labels that may be set.
Rule SELinuxStrategy Rule SELinuxStrategy
// seLinuxOptions required to run as; required for MustRunAs // seLinuxOptions required to run as; required for MustRunAs
// More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context // More info: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/security_context.md
// +optional // +optional
SELinuxOptions *api.SELinuxOptions SELinuxOptions *api.SELinuxOptions
} }

56
pkg/apis/extensions/v1beta1/types.go
View File

@@ -44,7 +44,7 @@ type ScaleStatus struct {
// avoid introspection in the clients. The string will be in the same format as the // avoid introspection in the clients. The string will be in the same format as the
// query-param syntax. If the target type only supports map-based selectors, both this // query-param syntax. If the target type only supports map-based selectors, both this
// field and map-based selector field are populated. // field and map-based selector field are populated.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"` TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"`
} }
@@ -421,7 +421,7 @@ type DaemonSetSpec struct {
// A label query over pods that are managed by the daemon set. // A label query over pods that are managed by the daemon set.
// Must match in order to be controlled. // Must match in order to be controlled.
// If empty, defaulted to labels on Pod template. // If empty, defaulted to labels on Pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"`
@@ -429,7 +429,7 @@ type DaemonSetSpec struct {
// The DaemonSet will create exactly one copy of this pod on every node // The DaemonSet will create exactly one copy of this pod on every node
// that matches the template's node selector (or on every node if no node // that matches the template's node selector (or on every node if no node
// selector is specified). // selector is specified).
// More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template
Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,2,opt,name=template"` Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,2,opt,name=template"`
// An update strategy to replace existing DaemonSet pods with new pods. // An update strategy to replace existing DaemonSet pods with new pods.
@@ -453,17 +453,17 @@ type DaemonSetSpec struct {
type DaemonSetStatus struct { type DaemonSetStatus struct {
// The number of nodes that are running at least 1 // The number of nodes that are running at least 1
// daemon pod and are supposed to run the daemon pod. // daemon pod and are supposed to run the daemon pod.
// More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md // More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
CurrentNumberScheduled int32 `json:"currentNumberScheduled" protobuf:"varint,1,opt,name=currentNumberScheduled"` CurrentNumberScheduled int32 `json:"currentNumberScheduled" protobuf:"varint,1,opt,name=currentNumberScheduled"`
// The number of nodes that are running the daemon pod, but are // The number of nodes that are running the daemon pod, but are
// not supposed to run the daemon pod. // not supposed to run the daemon pod.
// More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md // More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
NumberMisscheduled int32 `json:"numberMisscheduled" protobuf:"varint,2,opt,name=numberMisscheduled"` NumberMisscheduled int32 `json:"numberMisscheduled" protobuf:"varint,2,opt,name=numberMisscheduled"`
// The total number of nodes that should be running the daemon // The total number of nodes that should be running the daemon
// pod (including nodes correctly running the daemon pod). // pod (including nodes correctly running the daemon pod).
// More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md // More info: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
DesiredNumberScheduled int32 `json:"desiredNumberScheduled" protobuf:"varint,3,opt,name=desiredNumberScheduled"` DesiredNumberScheduled int32 `json:"desiredNumberScheduled" protobuf:"varint,3,opt,name=desiredNumberScheduled"`
// The number of nodes that should be running the daemon pod and have one // The number of nodes that should be running the daemon pod and have one
@@ -497,12 +497,12 @@ type DaemonSetStatus struct {
type DaemonSet struct { type DaemonSet struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// The desired behavior of this daemon set. // The desired behavior of this daemon set.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec DaemonSetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec DaemonSetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
@@ -510,7 +510,7 @@ type DaemonSet struct {
// out of date by some window of time. // out of date by some window of time.
// Populated by the system. // Populated by the system.
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status DaemonSetStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` Status DaemonSetStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
} }
@@ -526,7 +526,7 @@ const (
type DaemonSetList struct { type DaemonSetList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -538,7 +538,7 @@ type DaemonSetList struct {
type ThirdPartyResourceDataList struct { type ThirdPartyResourceDataList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -555,17 +555,17 @@ type ThirdPartyResourceDataList struct {
type Ingress struct { type Ingress struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is the desired state of the Ingress. // Spec is the desired state of the Ingress.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec IngressSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec IngressSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
// Status is the current state of the Ingress. // Status is the current state of the Ingress.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status IngressStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` Status IngressStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
} }
@@ -574,7 +574,7 @@ type Ingress struct {
type IngressList struct { type IngressList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -725,7 +725,7 @@ type ReplicaSet struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec defines the specification of the desired behavior of the ReplicaSet. // Spec defines the specification of the desired behavior of the ReplicaSet.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Spec ReplicaSetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` Spec ReplicaSetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
@@ -733,7 +733,7 @@ type ReplicaSet struct {
// This data may be out of date by some window of time. // This data may be out of date by some window of time.
// Populated by the system. // Populated by the system.
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
// +optional // +optional
Status ReplicaSetStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` Status ReplicaSetStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
} }
@@ -742,12 +742,12 @@ type ReplicaSet struct {
type ReplicaSetList struct { type ReplicaSetList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#types-kinds
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of ReplicaSets. // List of ReplicaSets.
// More info: http://kubernetes.io/docs/user-guide/replication-controller // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller
Items []ReplicaSet `json:"items" protobuf:"bytes,2,rep,name=items"` Items []ReplicaSet `json:"items" protobuf:"bytes,2,rep,name=items"`
} }
@@ -756,7 +756,7 @@ type ReplicaSetSpec struct {
// Replicas is the number of desired replicas. // Replicas is the number of desired replicas.
// This is a pointer to distinguish between explicit zero and unspecified. // This is a pointer to distinguish between explicit zero and unspecified.
// Defaults to 1. // Defaults to 1.
// More info: http://kubernetes.io/docs/user-guide/replication-controller#what-is-a-replication-controller // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller
// +optional // +optional
Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,1,opt,name=replicas"` Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,1,opt,name=replicas"`
@@ -769,13 +769,13 @@ type ReplicaSetSpec struct {
// Selector is a label query over pods that should match the replica count. // Selector is a label query over pods that should match the replica count.
// If the selector is empty, it is defaulted to the labels present on the pod template. // If the selector is empty, it is defaulted to the labels present on the pod template.
// Label keys and values that must match in order to be controlled by this replica set. // Label keys and values that must match in order to be controlled by this replica set.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
// +optional // +optional
Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"`
// Template is the object that describes the pod that will be created if // Template is the object that describes the pod that will be created if
// insufficient replicas are detected. // insufficient replicas are detected.
// More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template
// +optional // +optional
Template v1.PodTemplateSpec `json:"template,omitempty" protobuf:"bytes,3,opt,name=template"` Template v1.PodTemplateSpec `json:"template,omitempty" protobuf:"bytes,3,opt,name=template"`
} }
@@ -783,7 +783,7 @@ type ReplicaSetSpec struct {
// ReplicaSetStatus represents the current status of a ReplicaSet. // ReplicaSetStatus represents the current status of a ReplicaSet.
type ReplicaSetStatus struct { type ReplicaSetStatus struct {
// Replicas is the most recently oberved number of replicas. // Replicas is the most recently oberved number of replicas.
// More info: http://kubernetes.io/docs/user-guide/replication-controller#what-is-a-replication-controller // More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller
Replicas int32 `json:"replicas" protobuf:"varint,1,opt,name=replicas"` Replicas int32 `json:"replicas" protobuf:"varint,1,opt,name=replicas"`
// The number of pods that have labels matching the labels of the pod template of the replicaset. // The number of pods that have labels matching the labels of the pod template of the replicaset.
@@ -844,7 +844,7 @@ type ReplicaSetCondition struct {
type PodSecurityPolicy struct { type PodSecurityPolicy struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -947,7 +947,7 @@ type SELinuxStrategyOptions struct {
// type is the strategy that will dictate the allowable labels that may be set. // type is the strategy that will dictate the allowable labels that may be set.
Rule SELinuxStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=SELinuxStrategy"` Rule SELinuxStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=SELinuxStrategy"`
// seLinuxOptions required to run as; required for MustRunAs // seLinuxOptions required to run as; required for MustRunAs
// More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context // More info: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/security_context.md
// +optional // +optional
SELinuxOptions *v1.SELinuxOptions `json:"seLinuxOptions,omitempty" protobuf:"bytes,2,opt,name=seLinuxOptions"` SELinuxOptions *v1.SELinuxOptions `json:"seLinuxOptions,omitempty" protobuf:"bytes,2,opt,name=seLinuxOptions"`
} }
@@ -1041,7 +1041,7 @@ const (
type PodSecurityPolicyList struct { type PodSecurityPolicyList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -1052,7 +1052,7 @@ type PodSecurityPolicyList struct {
type NetworkPolicy struct { type NetworkPolicy struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -1136,7 +1136,7 @@ type NetworkPolicyPeer struct {
type NetworkPolicyList struct { type NetworkPolicyList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

2
pkg/apis/settings/v1alpha1/types.go
View File

@@ -58,7 +58,7 @@ type PodPresetSpec struct {
type PodPresetList struct { type PodPresetList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

2
pkg/apis/storage/types.go
View File

@@ -51,7 +51,7 @@ type StorageClass struct {
type StorageClassList struct { type StorageClassList struct {
metav1.TypeMeta metav1.TypeMeta
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta metav1.ListMeta

4
pkg/apis/storage/v1/types.go
View File

@@ -31,7 +31,7 @@ import (
type StorageClass struct { type StorageClass struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -48,7 +48,7 @@ type StorageClass struct {
type StorageClassList struct { type StorageClassList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

4
pkg/apis/storage/v1beta1/types.go
View File

@@ -31,7 +31,7 @@ import (
type StorageClass struct { type StorageClass struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -48,7 +48,7 @@ type StorageClass struct {
type StorageClassList struct { type StorageClassList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
// +optional // +optional
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`