Skip to content

Rebase 1.7.6 #16615

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

Merged
openshift-merge-robot merged 27 commits into from
Oct 5, 2017
Merged

Rebase 1.7.6 #16615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3a163e1
Update hack/godep-restore.sh to match fork names
soltysh Sep 28, 2017
771a804
bump(github.com/fatih/structs): 7e5a8eef611ee84dd359503f3969f80df4c50723
soltysh Sep 29, 2017
25e7dfd
bump(github.com/containers/image): dbd0a4cee2480da39048095a326506ae11…
soltysh Sep 29, 2017
24501f4
bump(github.com/docker/distribution): 1e2bbed6e09c6c8047f52af965a6e30…
soltysh Sep 29, 2017
b2d9319
bump(github.com/google/cadvisor): c683567ed073eb6bcab81cccee79cd64a0e…
soltysh Sep 29, 2017
450a2e4
bump(github.com/emicklei/go-restful-swagger12): 885875a92c2ab7d6222e2…
soltysh Sep 29, 2017
cc2b9f1
bump(k8s.io/kubernetes): a08f5eeb6246134f4ae5443c0593d72fd057ea7c
soltysh Sep 29, 2017
e4b8c39
UPSTREAM: 50036: Bring volume operation metrics
gnufied Sep 21, 2017
5cc233f
UPSTREAM: 52675: Fix FC WaitForAttach not mounting a volume
rootfs Sep 21, 2017
a118952
UPSTREAM: 52687: Refactoring and improvements for iSCSI and FC storag…
rootfs Sep 21, 2017
6f9eacb
UPSTREAM: 52691: FC plugin: Return target wwn + lun at GetVolumeName()
rootfs Sep 21, 2017
16e2fa1
UPSTREAM: 51796: Fix pod and node names switched around in error mess…
Sep 15, 2017
1f7b121
UPSTREAM: 52112: Allow watch cache disablement per type
smarterclayton Sep 17, 2017
f19116c
UPSTREAM: 51972: ProducesObject should only update the returned API o…
Sep 5, 2017
6436aca
UPSTREAM: 51035: Show events when describing service accounts
Aug 11, 2017
6c3b0f5
UPSTREAM: 53069: Align imagefs eviction defaults with image gc defaults
sjenning Sep 28, 2017
b547f04
UPSTREAM: 47806: kubelet: fix inconsistent display of terminated pod …
dcbw Jun 20, 2017
6d145c9
UPSTREAM: 52864: dockershim: fine-tune network-ready handling on sand…
dcbw Sep 21, 2017
d64738c
UPSTREAM: 53318: create separate transports for liveness and readines…
sjenning Oct 2, 2017
ddf7b91
UPSTREAM: <carry>: update namespace lifecycle to allow review APIs
deads2k Sep 28, 2017
0770a4a
UPSTREAM: <drop>: aggregate openapi through servers. 1.8 should fix t…
soltysh Sep 29, 2017
7dd3445
UPSTREAM: <drop>: Adapt etcd testing util to v3.2.1
liggitt Jul 19, 2017
822a0e1
UPSTREAM: docker/distribution: <carry>: Azure dependencies
soltysh Sep 30, 2017
526bd5d
UPSTREAM: <carry>: openapi generation for createNamespacedDeploymentC…
soltysh Oct 2, 2017
44f6988
OpenShift changes after the rebase to 1.7.6
soltysh Sep 29, 2017
1f2d677
UPSTREAM: <drop>: generated updates
soltysh Oct 2, 2017
911690d
Generated updates
soltysh Oct 2, 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
  •  
  •  
  •  
5,764 changes: 2,962 additions & 2,802 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions api/docs/api/v1.Pod.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ $ curl -k \

[[Post-api-v1-namespaces-namespace-pods-name-binding]]
=== Create binding of a Pod in a namespace
Create binding of a Binding
Create binding of a Pod

==== HTTP request
----
Expand Down Expand Up @@ -1749,7 +1749,7 @@ EOF

[[Post-api-v1-namespaces-namespace-pods-name-eviction]]
=== Create eviction of a Pod in a namespace
Create eviction of an Eviction
Create eviction of a Pod

==== HTTP request
----
Expand Down
12 changes: 6 additions & 6 deletions api/docs/api/v1.ReplicationController.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@ $ curl -k \

[[Get-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Get scale of a ReplicationController in a namespace
Read scale of the specified Scale
Read scale of the specified ReplicationController

==== HTTP request
----
Expand Down Expand Up @@ -1613,7 +1613,7 @@ $ curl -k \

[[Get-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Get scale of a ReplicationController in a namespace
Read scale of the specified Scale
Read scale of the specified ReplicationControllerDummy

==== HTTP request
----
Expand Down Expand Up @@ -1667,7 +1667,7 @@ $ curl -k \

[[Put-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Update scale of a ReplicationController in a namespace
Replace scale of the specified Scale
Replace scale of the specified ReplicationController

==== HTTP request
----
Expand Down Expand Up @@ -1745,7 +1745,7 @@ EOF

[[Put-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Update scale of a ReplicationController in a namespace
Replace scale of the specified Scale
Replace scale of the specified ReplicationControllerDummy

==== HTTP request
----
Expand Down Expand Up @@ -1823,7 +1823,7 @@ EOF

[[Patch-api-v1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Patch scale of a ReplicationController in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified ReplicationController

==== HTTP request
----
Expand Down Expand Up @@ -1899,7 +1899,7 @@ EOF

[[Patch-apis-extensions-v1beta1-namespaces-namespace-replicationcontrollers-name-scale]]
=== Patch scale of a ReplicationController in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified ReplicationControllerDummy

==== HTTP request
----
Expand Down
12 changes: 6 additions & 6 deletions api/docs/apis-apps.openshift.io/v1.DeploymentConfig.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ $ curl -k \

[[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
=== Create instantiate of a DeploymentConfig in a namespace
Create instantiate of a DeploymentRequest
Create instantiate of a DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -1909,7 +1909,7 @@ EOF

[[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-log]]
=== Get log of a DeploymentConfig in a namespace
Read log of the specified DeploymentLog
Read log of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -1972,7 +1972,7 @@ $ curl -k \

[[Post-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
=== Create rollback of a DeploymentConfig in a namespace
Create rollback of a DeploymentConfigRollback
Create rollback of a DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2050,7 +2050,7 @@ EOF

[[Get-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Get scale of a DeploymentConfig in a namespace
Read scale of the specified Scale
Read scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2104,7 +2104,7 @@ $ curl -k \

[[Put-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Update scale of a DeploymentConfig in a namespace
Replace scale of the specified Scale
Replace scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2182,7 +2182,7 @@ EOF

[[Patch-apis-apps.openshift.io-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Patch scale of a DeploymentConfig in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down
8 changes: 4 additions & 4 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 @@ -1578,7 +1578,7 @@ $ curl -k \

[[Post-apis-apps-v1beta1-namespaces-namespace-deployments-name-rollback]]
=== Create rollback of a Deployment in a namespace
Create rollback of a DeploymentRollback
Create rollback of a Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1656,7 +1656,7 @@ EOF

[[Get-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Get scale of a Deployment in a namespace
Read scale of the specified Scale
Read scale of the specified Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1710,7 +1710,7 @@ $ curl -k \

[[Put-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Update scale of a Deployment in a namespace
Replace scale of the specified Scale
Replace scale of the specified Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1788,7 +1788,7 @@ EOF

[[Patch-apis-apps-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Patch scale of a Deployment in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified Deployment

==== HTTP request
----
Expand Down
4 changes: 2 additions & 2 deletions api/docs/apis-build.openshift.io/v1.Build.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ $ curl -k \

[[Post-apis-build.openshift.io-v1-namespaces-namespace-builds-name-clone]]
=== Create clone of a Build in a namespace
Create clone of a BuildRequest
Create clone of a Build

==== HTTP request
----
Expand Down Expand Up @@ -1364,7 +1364,7 @@ EOF

[[Get-apis-build.openshift.io-v1-namespaces-namespace-builds-name-log]]
=== Get log of a Build in a namespace
Read log of the specified BuildLog
Read log of the specified Build

==== HTTP request
----
Expand Down
8 changes: 4 additions & 4 deletions api/docs/apis-build.openshift.io/v1.BuildConfig.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ $ curl -k \

[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiate]]
=== Create instantiate of a BuildConfig in a namespace
Create instantiate of a BuildRequest
Create instantiate of a BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1222,7 +1222,7 @@ EOF

[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
=== Create instantiatebinary of a BuildConfig in a namespace
Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
Connect POST requests to instantiatebinary of BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1281,7 +1281,7 @@ $ curl -k \

[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks]]
=== Create webhooks of a BuildConfig in a namespace
Connect POST requests to webhooks of Build
Connect POST requests to webhooks of BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1334,7 +1334,7 @@ $ curl -k \

[[Post-apis-build.openshift.io-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
=== Create webhooks/{path} of a BuildConfig in a namespace
Connect POST requests to webhooks of Build
Connect POST requests to webhooks of BuildConfig

==== HTTP request
----
Expand Down
8 changes: 4 additions & 4 deletions api/docs/apis-extensions/v1beta1.Deployment.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,7 @@ $ curl -k \

[[Post-apis-extensions-v1beta1-namespaces-namespace-deployments-name-rollback]]
=== Create rollback of a Deployment in a namespace
Create rollback of a DeploymentRollback
Create rollback of a Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1656,7 +1656,7 @@ EOF

[[Get-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Get scale of a Deployment in a namespace
Read scale of the specified Scale
Read scale of the specified Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1710,7 +1710,7 @@ $ curl -k \

[[Put-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Update scale of a Deployment in a namespace
Replace scale of the specified Scale
Replace scale of the specified Deployment

==== HTTP request
----
Expand Down Expand Up @@ -1788,7 +1788,7 @@ EOF

[[Patch-apis-extensions-v1beta1-namespaces-namespace-deployments-name-scale]]
=== Patch scale of a Deployment in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified Deployment

==== HTTP request
----
Expand Down
6 changes: 3 additions & 3 deletions api/docs/apis-extensions/v1beta1.ReplicaSet.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ $ curl -k \

[[Get-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
=== Get scale of a ReplicaSet in a namespace
Read scale of the specified Scale
Read scale of the specified ReplicaSet

==== HTTP request
----
Expand Down Expand Up @@ -1619,7 +1619,7 @@ $ curl -k \

[[Put-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
=== Update scale of a ReplicaSet in a namespace
Replace scale of the specified Scale
Replace scale of the specified ReplicaSet

==== HTTP request
----
Expand Down Expand Up @@ -1697,7 +1697,7 @@ EOF

[[Patch-apis-extensions-v1beta1-namespaces-namespace-replicasets-name-scale]]
=== Patch scale of a ReplicaSet in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified ReplicaSet

==== HTTP request
----
Expand Down
2 changes: 1 addition & 1 deletion api/docs/apis-image.openshift.io/v1.ImageStream.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ $ curl -k \

[[Get-apis-image.openshift.io-v1-namespaces-namespace-imagestreams-name-secrets]]
=== Get secrets of a ImageStream in a namespace
Read secrets of the specified SecretList
Read secrets of the specified ImageStream

==== HTTP request
----
Expand Down
4 changes: 2 additions & 2 deletions api/docs/oapi/v1.Build.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-builds-name-clone]]
=== Create clone of a Build in a namespace
Create clone of a BuildRequest
Create clone of a Build

==== HTTP request
----
Expand Down Expand Up @@ -1364,7 +1364,7 @@ EOF

[[Get-oapi-v1-namespaces-namespace-builds-name-log]]
=== Get log of a Build in a namespace
Read log of the specified BuildLog
Read log of the specified Build

==== HTTP request
----
Expand Down
8 changes: 4 additions & 4 deletions api/docs/oapi/v1.BuildConfig.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiate]]
=== Create instantiate of a BuildConfig in a namespace
Create instantiate of a BuildRequest
Create instantiate of a BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1222,7 +1222,7 @@ EOF

[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-instantiatebinary]]
=== Create instantiatebinary of a BuildConfig in a namespace
Connect POST requests to instantiatebinary of BinaryBuildRequestOptions
Connect POST requests to instantiatebinary of BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1281,7 +1281,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks]]
=== Create webhooks of a BuildConfig in a namespace
Connect POST requests to webhooks of Build
Connect POST requests to webhooks of BuildConfig

==== HTTP request
----
Expand Down Expand Up @@ -1334,7 +1334,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-buildconfigs-name-webhooks-path]]
=== Create webhooks/{path} of a BuildConfig in a namespace
Connect POST requests to webhooks of Build
Connect POST requests to webhooks of BuildConfig

==== HTTP request
----
Expand Down
12 changes: 6 additions & 6 deletions api/docs/oapi/v1.DeploymentConfig.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-instantiate]]
=== Create instantiate of a DeploymentConfig in a namespace
Create instantiate of a DeploymentRequest
Create instantiate of a DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -1909,7 +1909,7 @@ EOF

[[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-log]]
=== Get log of a DeploymentConfig in a namespace
Read log of the specified DeploymentLog
Read log of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -1972,7 +1972,7 @@ $ curl -k \

[[Post-oapi-v1-namespaces-namespace-deploymentconfigs-name-rollback]]
=== Create rollback of a DeploymentConfig in a namespace
Create rollback of a DeploymentConfigRollback
Create rollback of a DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2050,7 +2050,7 @@ EOF

[[Get-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Get scale of a DeploymentConfig in a namespace
Read scale of the specified Scale
Read scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2104,7 +2104,7 @@ $ curl -k \

[[Put-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Update scale of a DeploymentConfig in a namespace
Replace scale of the specified Scale
Replace scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down Expand Up @@ -2182,7 +2182,7 @@ EOF

[[Patch-oapi-v1-namespaces-namespace-deploymentconfigs-name-scale]]
=== Patch scale of a DeploymentConfig in a namespace
Partially update scale of the specified Scale
Partially update scale of the specified DeploymentConfig

==== HTTP request
----
Expand Down
Loading