From c1c6faf59b712b392c81d11ffc0c7dcf3750c52b Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 13 Jun 2017 11:00:43 -0400 Subject: [PATCH] Add documentation for podpreset opt-out annotation This adds the annotation for having the podpreset admission controller to skip (opt-out) manipulating the pod spec. Also, the annotation format for what presets have acted on a pod has been modified to add a prefix of "podpreset-". The new naming makes it such that there is no chance of collision with the newly introduced opt-out annotation (or future ones yet to be added). Opt-out annotation PR: kubernetes/kubernetes#44965 --- docs/tasks/inject-data-application/podpreset.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/tasks/inject-data-application/podpreset.md b/docs/tasks/inject-data-application/podpreset.md index 1234cc9f94..cbc3b368cb 100644 --- a/docs/tasks/inject-data-application/podpreset.md +++ b/docs/tasks/inject-data-application/podpreset.md @@ -51,7 +51,7 @@ Kubernetes modifies the Pod Spec. Kubernetes annotates the resulting modified pod spec to show that it was modified by a `PodPreset`. The annotation is of the form -`podpreset.admission.kubernetes.io/": ""`. +`podpreset.admission.kubernetes.io/podpreset-": ""`. ## Enable Pod Preset @@ -63,6 +63,12 @@ following 1. You have enabled the admission controller `PodPreset` 1. You have defined your pod presets +## Disable Pod Preset for a pod + +There may be instances where you wish for a pod to not be altered by any pod +preset mutations. For these events, one can add an annotation in the pod spec +of the form: `podpreset.admission.kubernetes.io/exclude: "true"`. + ## Create a Pod Preset ### Simple Pod Spec Example