Skip to content

Commit

Permalink
Merge pull request #18003 from deads2k/rebase-to1.9.1
Browse files Browse the repository at this point in the history 
Rebase to 1.9.1
  • Loading branch information
@liggitt
liggitt committed Jan 10, 2018
2 parents a90f8af + 7294520 commit ff839e6
Show file tree
Hide file tree
Showing 2,162 changed files with 9,015 additions and 71,385 deletions.
2 changes: 1 addition & 1 deletion api/docs/api/v1.PersistentVolume.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.">wwids</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.">flexVolume</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.">flexVolume</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Driver is the name of the driver to use for this volume.">driver</span>:
</div><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;. The default filesystem depends on FlexVolume script.">fsType</span>:
</div><details><summary> <span title="(object) Optional: Extra command options if any.">options</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.Pod.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
</div><div style="margin-left:13px;"> <span title="(boolean) Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.">readOnly</span>:
</div><div style="margin-left:13px;"> <span title="(string) Path within the volume from which the container&#39;s volume should be mounted. Defaults to &#34;&#34; (volume&#39;s root).">subPath</span>:
</div></details><div style="margin-left:13px;"> <span title="(string) Container&#39;s working directory. If not specified, the container runtime&#39;s default will be used, which might be configured in the container image. Cannot be updated.">workingDir</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.">dnsConfig</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy. This is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsConfig</span>:
</summary><details><summary> <span title="(array) A list of DNS name server IP addresses. This will be appended to the base nameservers generated from DNSPolicy. Duplicated nameservers will be removed.">nameservers</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) A list of DNS resolver options. This will be merged with the base options generated from DNSPolicy. Duplicated entries will be removed. Resolution options given in Options will override those that appear in the base DNSPolicy.">options</span>:
</summary><div style="margin-left:13px;"> - <span title="(string) Required.">name</span>:
</div><div style="margin-left:13px;"> <span title="(string)">value</span>:
</div></details><details><summary> <span title="(array) A list of DNS search domains for host-name lookup. This will be appended to the base search paths generated from DNSPolicy. Duplicated search paths will be removed.">searches</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;.">dnsPolicy</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;. Note that &#39;None&#39; policy is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsPolicy</span>:
</div><details><summary> <span title="(array) HostAliases is an optional list of hosts and IPs that will be injected into the pod&#39;s hosts file if specified. This is only valid for non-hostNetwork pods.">hostAliases</span>:
</summary><details><summary> - <span title="(array) Hostnames for the above IP address.">hostnames</span>:
</summary><div style="margin-left:13px;"> - - <span title="(string)">[string]</span>:
Expand Down Expand Up @@ -571,7 +571,7 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.">wwids</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.">flexVolume</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.">flexVolume</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Driver is the name of the driver to use for this volume.">driver</span>:
</div><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;. The default filesystem depends on FlexVolume script.">fsType</span>:
</div><details><summary> <span title="(object) Optional: Extra command options if any.">options</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.PodTemplate.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,15 +381,15 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
</div><div style="margin-left:13px;"> <span title="(boolean) Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.">readOnly</span>:
</div><div style="margin-left:13px;"> <span title="(string) Path within the volume from which the container&#39;s volume should be mounted. Defaults to &#34;&#34; (volume&#39;s root).">subPath</span>:
</div></details><div style="margin-left:13px;"> <span title="(string) Container&#39;s working directory. If not specified, the container runtime&#39;s default will be used, which might be configured in the container image. Cannot be updated.">workingDir</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.">dnsConfig</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy. This is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsConfig</span>:
</summary><details><summary> <span title="(array) A list of DNS name server IP addresses. This will be appended to the base nameservers generated from DNSPolicy. Duplicated nameservers will be removed.">nameservers</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) A list of DNS resolver options. This will be merged with the base options generated from DNSPolicy. Duplicated entries will be removed. Resolution options given in Options will override those that appear in the base DNSPolicy.">options</span>:
</summary><div style="margin-left:13px;"> - <span title="(string) Required.">name</span>:
</div><div style="margin-left:13px;"> <span title="(string)">value</span>:
</div></details><details><summary> <span title="(array) A list of DNS search domains for host-name lookup. This will be appended to the base search paths generated from DNSPolicy. Duplicated search paths will be removed.">searches</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;.">dnsPolicy</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;. Note that &#39;None&#39; policy is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsPolicy</span>:
</div><details><summary> <span title="(array) HostAliases is an optional list of hosts and IPs that will be injected into the pod&#39;s hosts file if specified. This is only valid for non-hostNetwork pods.">hostAliases</span>:
</summary><details><summary> - <span title="(array) Hostnames for the above IP address.">hostnames</span>:
</summary><div style="margin-left:13px;"> - - <span title="(string)">[string]</span>:
Expand Down Expand Up @@ -641,7 +641,7 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.">wwids</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.">flexVolume</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.">flexVolume</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Driver is the name of the driver to use for this volume.">driver</span>:
</div><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;. The default filesystem depends on FlexVolume script.">fsType</span>:
</div><details><summary> <span title="(object) Optional: Extra command options if any.">options</span>:
Expand Down
6 changes: 3 additions & 3 deletions api/docs/api/v1.ReplicationController.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,15 @@ Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-gu
</div><div style="margin-left:13px;"> <span title="(boolean) Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.">readOnly</span>:
</div><div style="margin-left:13px;"> <span title="(string) Path within the volume from which the container&#39;s volume should be mounted. Defaults to &#34;&#34; (volume&#39;s root).">subPath</span>:
</div></details><div style="margin-left:13px;"> <span title="(string) Container&#39;s working directory. If not specified, the container runtime&#39;s default will be used, which might be configured in the container image. Cannot be updated.">workingDir</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.">dnsConfig</span>:
</div></details><details><summary> <span title="(v1.PodDNSConfig) Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy. This is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsConfig</span>:
</summary><details><summary> <span title="(array) A list of DNS name server IP addresses. This will be appended to the base nameservers generated from DNSPolicy. Duplicated nameservers will be removed.">nameservers</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) A list of DNS resolver options. This will be merged with the base options generated from DNSPolicy. Duplicated entries will be removed. Resolution options given in Options will override those that appear in the base DNSPolicy.">options</span>:
</summary><div style="margin-left:13px;"> - <span title="(string) Required.">name</span>:
</div><div style="margin-left:13px;"> <span title="(string)">value</span>:
</div></details><details><summary> <span title="(array) A list of DNS search domains for host-name lookup. This will be appended to the base search paths generated from DNSPolicy. Duplicated search paths will be removed.">searches</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;.">dnsPolicy</span>:
</div></details></details><div style="margin-left:13px;"> <span title="(string) Set DNS policy for the pod. Defaults to &#34;ClusterFirst&#34;. Valid values are &#39;ClusterFirstWithHostNet&#39;, &#39;ClusterFirst&#39;, &#39;Default&#39; or &#39;None&#39;. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to &#39;ClusterFirstWithHostNet&#39;. Note that &#39;None&#39; policy is an alpha feature introduced in v1.9 and CustomPodDNS feature gate must be enabled to use it.">dnsPolicy</span>:
</div><details><summary> <span title="(array) HostAliases is an optional list of hosts and IPs that will be injected into the pod&#39;s hosts file if specified. This is only valid for non-hostNetwork pods.">hostAliases</span>:
</summary><details><summary> - <span title="(array) Hostnames for the above IP address.">hostnames</span>:
</summary><div style="margin-left:13px;"> - - <span title="(string)">[string]</span>:
Expand Down Expand Up @@ -646,7 +646,7 @@ If unset, the Kubelet will not modify the ownership and permissions of any volum
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details><details><summary> <span title="(array) Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.">wwids</span>:
</summary><div style="margin-left:13px;"> - <span title="(string)">[string]</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.">flexVolume</span>:
</div></details></details><details><summary> <span title="(v1.FlexVolumeSource) FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.">flexVolume</span>:
</summary><div style="margin-left:13px;"> <span title="(string) Driver is the name of the driver to use for this volume.">driver</span>:
</div><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;. The default filesystem depends on FlexVolume script.">fsType</span>:
</div><details><summary> <span title="(object) Optional: Extra command options if any.">options</span>:
Expand Down
Loading

0 comments on commit ff839e6

Please sign in to comment.