Merge pull request #49328 from euank/etcd-selinux-default

Automatic merge from submit-queue (batch tested with PRs 49328, 49285, 49307, 49127, 49163) kubeadm: don't customize etcd selinux label The original change that added the unconfined label included a comment indicating it won't be needed in the future. See: https://github.com/kubernetes/kubernetes/pull/33555#issuecomment-251126908 That time is now. https://github.com/kubernetes/kubernetes/pull/33663 has landed and means we no longer have to go out of our way to make that work. Removing the label also increases security since there wasn't really a good reason for etcd to be run with such broad selinux privileges. This also will allow kubeadm to avoid errors on distros without an spc_t type, such as Gentoo and Container Linux (at the time of writing at least). Fixes https://github.com/kubernetes/kubeadm/issues/269 **Release note**: ```release-note NONE ```

Merge pull request #49328 from euank/etcd-selinux-default
ec9275d6 · Kubernetes Submit Queue · GitHub · ef98b80b · 644aef10 · ec9275d6
Commit ec9275d6 authored Jul 21, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

manifests.go cmd/kubeadm/app/phases/controlplane/manifests.go +0 -7

No files found.
--- a/cmd/kubeadm/app/phases/controlplane/manifests.go
+++ b/cmd/kubeadm/app/phases/controlplane/manifests.go
@@ -119,13 +119,6 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 			LivenessProbe: componentProbe(2379, "/health", v1.URISchemeHTTP),
 		}, certsVolume(cfg), etcdVolume(cfg), k8sVolume())
-		etcdPod.Spec.SecurityContext = &v1.PodSecurityContext{
-			SELinuxOptions: &v1.SELinuxOptions{
-				// Unconfine the etcd container so it can write to the data dir with SELinux enforcing:
-				Type: "spc_t",
-			},
-		}
 		staticPodSpecs[etcd] = etcdPod
 	}