From 8c881a35cd98fb8a5efa762df21b7c104411b335 Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Sat, 6 May 2017 11:50:17 +0800 Subject: [PATCH 1/3] Init container exists beta in 1.6. --- docs/concepts/workloads/pods/init-containers.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/concepts/workloads/pods/init-containers.md b/docs/concepts/workloads/pods/init-containers.md index 4a3dd7c990..7c283b7568 100644 --- a/docs/concepts/workloads/pods/init-containers.md +++ b/docs/concepts/workloads/pods/init-containers.md @@ -17,10 +17,9 @@ scripts not present in an app image. {:toc} -{% assign for_k8s_version="v1.5" %}{% include feature-state-beta.md %} - -Once the feature exits beta, Init Containers will be specified in the PodSpec -alongside the app `containers` array. +This feature has exited beta in 1.6. Init Containers can be specified in the PodSpec +alongside the app `containers` array. The beta annotation value will still be respected +and overrides the PodSpec field value. {% capture body %} ## Understanding Init Containers From 1bed34e5c935799598e803adc8ba8b88ee9afe70 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 24 May 2017 16:20:31 +0200 Subject: [PATCH 2/3] docs/concepts/policy/pod-security-policy.md: add projected to list of allowed types. --- docs/concepts/policy/pod-security-policy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/concepts/policy/pod-security-policy.md b/docs/concepts/policy/pod-security-policy.md index a1529ddb54..c9b22cce03 100644 --- a/docs/concepts/policy/pod-security-policy.md +++ b/docs/concepts/policy/pod-security-policy.md @@ -122,7 +122,7 @@ to the volume sources that are defined when creating a volume: 1. \* (allow all volumes) The recommended minimum set of allowed volumes for new PSPs are -configMap, downwardAPI, emptyDir, persistentVolumeClaim, and secret. +configMap, downwardAPI, emptyDir, persistentVolumeClaim, secret, and projected. ### Host Network - *HostPorts*, default `empty`. List of `HostPortRange`, defined by `min`(inclusive) and `max`(inclusive), which define the allowed host ports. @@ -168,7 +168,7 @@ $ kubectl get psp NAME PRIV CAPS SELINUX RUNASUSER FSGROUP SUPGROUP READONLYROOTFS VOLUMES permissive false [] RunAsAny RunAsAny RunAsAny RunAsAny false [*] privileged true [] RunAsAny RunAsAny RunAsAny RunAsAny false [*] -restricted false [] RunAsAny MustRunAsNonRoot RunAsAny RunAsAny false [emptyDir secret downwardAPI configMap persistentVolumeClaim] +restricted false [] RunAsAny MustRunAsNonRoot RunAsAny RunAsAny false [emptyDir secret downwardAPI configMap persistentVolumeClaim projected] ``` ## Editing a Pod Security Policy From c7ba600025c7a3d9d3380118e35f5115aa0f23cf Mon Sep 17 00:00:00 2001 From: roshandawrani Date: Mon, 29 May 2017 11:52:56 +0530 Subject: [PATCH 3/3] Fixed a minor mistake The word "creating" seemed missing. global allocation map should have an entry for an IP address that the service gets while it's created, right? --- docs/concepts/services-networking/service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/services-networking/service.md b/docs/concepts/services-networking/service.md index 990795f031..f8c7757e51 100644 --- a/docs/concepts/services-networking/service.md +++ b/docs/concepts/services-networking/service.md @@ -550,7 +550,7 @@ ensure that no two `Services` can collide. We do that by allocating each `Service` its own IP address. To ensure each service receives a unique IP, an internal allocator atomically -updates a global allocation map in etcd prior to each service. The map object +updates a global allocation map in etcd prior to creating each service. The map object must exist in the registry for services to get IPs, otherwise creations will fail with a message indicating an IP could not be allocated. A background controller is responsible for creating that map (to migrate from older versions