Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.8.4 rebase #17503

Closed
wants to merge 6 commits into from
Closed

1.8.4 rebase #17503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51ff328
bump(k8s.io/kubernetes): df9dcff5ea99697b35ab5726485ea644babddd0e
liggitt Nov 28, 2017
2ad452e
Adjust deploymentconfig GroupVersionKindProvider
liggitt Nov 29, 2017
893993d
Update kube proxy IPVS defaults
liggitt Dec 12, 2017
053fc2c
Fixup restclient
liggitt Dec 12, 2017
a5a2ea2
Regenerate policy
liggitt Nov 29, 2017
f71db0c
Generated files
liggitt Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 7 additions & 6 deletions api/docs/api/v1.PersistentVolume.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,17 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(string) The rados user name. Default is admin. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it">user</span>:
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</div></details><details><summary> <span title="(v1.ScaleIOPersistentVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div><details><summary> <span title="(v1.SecretReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name is unique within a namespace to reference a secret resource.">name</span>:
</div><div style="margin-left:13px;"> <span title="(string) Namespace defines the space within which the secret name must be unique.">namespace</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><div style="margin-left:13px;"> <span title="(string) Name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass.">storageClassName</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.Pod.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,13 +661,13 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><details><summary> <span title="(v1.SecretVolumeSource) Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret">secret</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.PodTemplate.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,13 +731,13 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><details><summary> <span title="(v1.SecretVolumeSource) Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret">secret</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.ReplicationController.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,13 +736,13 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><details><summary> <span title="(v1.SecretVolumeSource) Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret">secret</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/apis-apps/v1beta1.Deployment.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,13 +752,13 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><details><summary> <span title="(v1.SecretVolumeSource) Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret">secret</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/apis-apps/v1beta1.StatefulSet.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,13 +747,13 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</div></details><details><summary> <span title="(v1.ScaleIOVolumeSource) ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.">scaleIO</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. &#34;ext4&#34;, &#34;xfs&#34;, &#34;ntfs&#34;. Implicitly inferred to be &#34;ext4&#34; if unspecified.">fsType</span>:
</div><div style="margin-left:13px;"> <span title="(string) The host address of the ScaleIO API Gateway.">gateway</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the Protection Domain for the configured storage (defaults to &#34;default&#34;).">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the ScaleIO Protection Domain for the configured storage.">protectionDomain</span>:
</div><div style="margin-left:13px;"> <span title="(boolean) Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.">readOnly</span>:
</div><details><summary> <span title="(v1.LocalObjectReference) SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.">secretRef</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names">name</span>:
</div></details><div style="margin-left:13px;"> <span title="(boolean) Flag to enable/disable SSL communication with Gateway, default false">sslEnabled</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be thick or thin (defaults to &#34;thin&#34;).">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The Storage Pool associated with the protection domain (defaults to &#34;default&#34;).">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) Indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.">storageMode</span>:
</div><div style="margin-left:13px;"> <span title="(string) The ScaleIO Storage Pool associated with the protection domain.">storagePool</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of the storage system as configured in ScaleIO.">system</span>:
</div><div style="margin-left:13px;"> <span title="(string) The name of a volume already created in the ScaleIO system that is associated with this volume source.">volumeName</span>:
</div></details><details><summary> <span title="(v1.SecretVolumeSource) Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret">secret</span>:
Expand Down
Loading