From b7bced378d7124276ce0b3a3f85de0699cd99ac9 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Tue, 27 Feb 2018 17:34:45 +0530 Subject: [PATCH] Add docs for CRD features for 1.10 (#7439) * Add docs for CRD features for 1.10 * Add CustomResourcesSubresources to list of feature gates * Add latest changes to custom resources doc --- docs/concepts/api-extension/custom-resources.md | 6 ++++++ docs/reference/feature-gates.md | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/docs/concepts/api-extension/custom-resources.md b/docs/concepts/api-extension/custom-resources.md index 4e22ccc635..eb3f8a0c98 100644 --- a/docs/concepts/api-extension/custom-resources.md +++ b/docs/concepts/api-extension/custom-resources.md @@ -159,7 +159,13 @@ Aggregated APIs offer more advanced API features and customization of other feat | Multi-versioning | Allows serving the same object through two API versions. Can help ease API changes like renaming fields. Less important if you control your client versions. | No | Yes | | Custom Storage | If you need storage with a different performance mode (for example, time-series database instead of key-value store) or isolation for security (for example, encryption secrets or different | No | Yes | | Custom Business Logic | Perform arbitrary checks or actions when creating, reading, updating or deleting an object | No, but can get some of the same effects with Initializers or Finalizers (requires programming) | Yes | +<<<<<<< HEAD | Subresources | {::nomarkdown}{:/} | No but planned | Yes, any Subresource | +||||||| merged common ancestors +| Subresources | {::nomarkdown}{:/} | No but planned | Yes, any Subresource | +======= +| Subresources | {::nomarkdown}{:/} | `status` and `scale` subresources are supported | Yes, any Subresource | +>>>>>>> Add docs for CRD features for 1.10 (#7439) | strategic-merge-patch | The new endpoints support PATCH with `Content-Type: application/strategic-merge-patch+json`. Useful for updating objects that may be modified both locally, and by the server. For more information, see ["Update API Objects in Place Using kubectl patch"](/docs/tasks/run-application/update-api-object-kubectl-patch/) | No | Yes | | Protocol Buffers | The new resource supports clients that want to use Protocol Buffers | No | Yes | | OpenAPI Schema | Is there an OpenAPI (swagger) schema for the types that can be dynamically fetched from the server? Is the user protected from misspelling field names by ensuring only allowed fields are set? Are types enforced (in other words, don't put an `int` in a `string` field?) | No but planned | Yes | diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md index f5e32649d7..2ce5abb1eb 100644 --- a/docs/reference/feature-gates.md +++ b/docs/reference/feature-gates.md @@ -55,7 +55,12 @@ different Kubernetes components. | `CustomResourceValidation` | `false` | Alpha | 1.8 | 1.8 | | `CustomResourceValidation` | `true` | Beta | 1.9 | | <<<<<<< HEAD +<<<<<<< HEAD | `DebugContainers` | `false` | Alpha | 1.10 | | +||||||| merged common ancestors +======= +| `CustomResourceSubresources` | `false` | Alpha | 1.10 | | +>>>>>>> Add docs for CRD features for 1.10 (#7439) | `DevicePlugins` | `false` | Alpha | 1.8 | 1.9 | | `DevicePlugins` | `true` | Beta | 1.10 | | ||||||| merged common ancestors @@ -187,12 +192,20 @@ Each feature gate is designed for enabling/disabling a specific feature: - `CustomPodDNS`: Enable customizing the DNS settings for a Pod using its `dnsConfig` property. Check [Pod's DNS Config](/docs/concepts/services-networking/dns-pod-service/#pods-dns-config) for more details. +<<<<<<< HEAD - `CustomResourceSubresources`: Enable `/status` and `/scale` subresources on resources created from [CustomResourceDefinition](/docs/concepts/api-extension/custom-resources/). - `CustomResourceValidation`: Enable schema based validation on resources created from [CustomResourceDefinition](/docs/concepts/api-extension/custom-resources/). - `DebugContainers`: Enable running a "debugging" container in a Pod's namespace to troubleshoot a running Pod. +||||||| merged common ancestors +- `CustomeResourceValidation`: Enable schema based validation on resources created from [CustomResourceDefinition](/docs/concepts/api-extension/custom-resources/). +======= +- `CustomeResourceValidation`: Enable schema based validation on resources created from [CustomResourceDefinition](/docs/concepts/api-extension/custom-resources/). +- `CustomResourceSubresources`: Enable `/status` and `/scale` subresources +on resources created from [CustomResourceDefinition](/docs/concepts/api-extension/custom-resources/). +>>>>>>> Add docs for CRD features for 1.10 (#7439) - `DevicePlugins`: Enable the [device-plugins](/docs/concepts/cluster-administration/device-plugins/) based resource provisioning on nodes. - `DynamicKubeletConfig`: Enable the dynamic configuration of kubelet. See [Reconfigure kubelet](/docs/tasks/administer-cluster/reconfigure-kubelet/).