Merge pull request #29510 from Quentin-M/fix_rkt_dns_perm

Automatic merge from submit-queue rkt: Fix /etc/hosts /etc/resolv.conf permissions #29024 introduced copying /etc/hosts and /etc/resolv.conf before mounting them into rkt containers. However, the new files' permissions are set to 0640, which make these files unusable by any other users than root in the container as shown below. This small patch changes the permissions to 0644, as typically set. ``` # host rabbitmq rabbitmq.default.svc.cluster.local has address 10.3.0.211 # ls -la /etc/resolv.conf -rw-r-----. 1 root root 102 Jul 23 13:20 /etc/resolv.conf # sudo -E -u foo bash $ cat /etc/resolv.conf cat: /etc/resolv.conf: Permission denied $ host rabbitmq ;; connection timed out; no servers could be reached # exit # chmod 0644 /etc/resolv.conf /etc/hosts # sudo -E -u foo host rabbitmq rabbitmq.default.svc.cluster.local has address 10.3.0.211 ``` cc @kubernetes/sig-rktnetes @yifan-gu @euank

Merge pull request #29510 from Quentin-M/fix_rkt_dns_perm
17e31bac · k8s-merge-robot · GitHub · cbe8cd58 · 9bf0ae5d · 17e31bac
Commit 17e31bac authored Jul 23, 2016 by k8s-merge-robot Committed by GitHub Jul 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

rkt.go pkg/kubelet/rkt/rkt.go +1 -1

No files found.
--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -659,7 +659,7 @@ func copyfile(src, dst string) error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(dst, data, 0640)
+	return ioutil.WriteFile(dst, data, 0644)
 }

 // TODO(yifan): Can make rkt handle this when '--net=host'. See https://github.com/coreos/rkt/issues/2430.