diff --git a/docs/api.md b/docs/api.md index 39027923e24..bb1271c5921 100644 --- a/docs/api.md +++ b/docs/api.md @@ -62,7 +62,8 @@ Some important differences between v1beta1/2 and v1beta3: * The namespace is required (for all namespaced resources) and has moved from a URL parameter to the path: `/api/v1beta3/namespaces/{namespace}/{resource_collection}/{resource_name}`. If you were not using a namespace before, use `default` here. * The names of all resource collections are now lower cased - instead of `replicationControllers`, use `replicationcontrollers`. * To watch for changes to a resource, open an HTTP or Websocket connection to the collection query and provide the `?watch=true` query parameter along with the desired `resourceVersion` parameter to watch from. -* The `labels` query parameter has been renamed to `label-selector`. +* The `labels` query parameter has been renamed to `labelSelector`. +* The `fields` query parameter has been renamed to `fieldSelector`. * The container `entrypoint` has been renamed to `command`, and `command` has been renamed to `args`. * Container, volume, and node resources are expressed as nested maps (e.g., `resources{cpu:1}`) rather than as individual fields, and resource values support [scaling suffixes](resources.md#resource-quantities) rather than fixed scales (e.g., milli-cores). * Restart policy is represented simply as a string (e.g., `"Always"`) rather than as a nested map (`always{}`). diff --git a/docs/labels.md b/docs/labels.md index 21ac1357ae8..1a5a871e154 100644 --- a/docs/labels.md +++ b/docs/labels.md @@ -82,8 +82,8 @@ _Set-based_ requirements can be mixed with _equality-based_ requirements. For ex LIST and WATCH operations may specify label selectors to filter the sets of objects returned using a query parameter. Both requirements are permitted: - * _equality-based_ requirements: `?label-selector=key1%3Dvalue1,key2%3Dvalue2` - * _set-based_ requirements: `?label-selector=key+in+%28value1%2Cvalue2%29%2Ckey2+notin+%28value3` + * _equality-based_ requirements: `?labelSelector=key1%3Dvalue1,key2%3Dvalue2` + * _set-based_ requirements: `?labelSelector=key+in+%28value1%2Cvalue2%29%2Ckey2+notin+%28value3%29` Kubernetes also currently supports two objects that use label selectors to keep track of their members, `service`s and `replicationcontroller`s: