From 0bd695d8d197182b455b6da9e9cdde7c08d3a84e Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrownccb@opensuse.org>
Date: Thu, 13 Sep 2018 17:44:34 +0200
Subject: [PATCH 1/2] Avoid marking configuration files as executable

---
 build/rpms/kubeadm.spec        | 10 +++++-----
 build/rpms/kubelet.spec        |  6 +++---
 build/rpms/kubernetes-cni.spec |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index b38ecdfb9bc..891eb5da76f 100644
--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -15,12 +15,12 @@ Command-line utility for deploying a Kubernetes cluster.
 
 %install
 install -m 755 -d %{buildroot}%{_bindir}
-install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
-install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
-install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
+install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/
+install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
+install -m 644 -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
-install -p -m 755 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
+install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
+install -p -m 644 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 
 %files
 %{_bindir}/kubeadm
diff --git a/build/rpms/kubelet.spec b/build/rpms/kubelet.spec
index d5e85bf9082..fcc716998f5 100644
--- a/build/rpms/kubelet.spec
+++ b/build/rpms/kubelet.spec
@@ -20,10 +20,10 @@ The node agent of Kubernetes, the container cluster manager.
 %install
 
 install -m 755 -d %{buildroot}%{_bindir}
-install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
-install -m 755 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
+install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/
+install -m 644 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
 install -p -m 755 -t %{buildroot}%{_bindir} {kubelet}
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
+install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
 
 %files
 %{_bindir}/kubelet
diff --git a/build/rpms/kubernetes-cni.spec b/build/rpms/kubernetes-cni.spec
index 4b4751d11cf..3f4f62e17be 100644
--- a/build/rpms/kubernetes-cni.spec
+++ b/build/rpms/kubernetes-cni.spec
@@ -15,7 +15,7 @@ tar -C ./bin -xz -f {cni-plugins-amd64-v0.6.0.tgz}
 
 %install
 
-install -m 755 -d %{buildroot}%{_sysconfdir}/cni/net.d/
+install -m 644 -d %{buildroot}%{_sysconfdir}/cni/net.d/
 install -m 755 -d %{buildroot}/opt/cni
 mv bin/ %{buildroot}/opt/cni/
 

From eabd95c8a1c6dc4d12450ac120329dc93f36544c Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrownccb@opensuse.org>
Date: Fri, 5 Oct 2018 15:32:15 +0200
Subject: [PATCH 2/2] correct directory modes

---
 build/rpms/kubeadm.spec        | 6 +++---
 build/rpms/kubelet.spec        | 4 ++--
 build/rpms/kubernetes-cni.spec | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index 098ce1de54f..19a33442fcd 100644
--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -15,9 +15,9 @@ Command-line utility for deploying a Kubernetes cluster.
 
 %install
 install -m 755 -d %{buildroot}%{_bindir}
-install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/
-install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
-install -m 644 -d %{buildroot}%{_sysconfdir}/sysconfig/
+install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
+install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
 install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
 install -p -m 644 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
diff --git a/build/rpms/kubelet.spec b/build/rpms/kubelet.spec
index 44c03261265..40abb09131f 100644
--- a/build/rpms/kubelet.spec
+++ b/build/rpms/kubelet.spec
@@ -20,8 +20,8 @@ The node agent of Kubernetes, the container cluster manager.
 %install
 
 install -m 755 -d %{buildroot}%{_bindir}
-install -m 644 -d %{buildroot}%{_sysconfdir}/systemd/system/
-install -m 644 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
+install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
+install -m 755 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
 install -p -m 755 -t %{buildroot}%{_bindir} {kubelet}
 install -p -m 644 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
 
diff --git a/build/rpms/kubernetes-cni.spec b/build/rpms/kubernetes-cni.spec
index 3f4f62e17be..4b4751d11cf 100644
--- a/build/rpms/kubernetes-cni.spec
+++ b/build/rpms/kubernetes-cni.spec
@@ -15,7 +15,7 @@ tar -C ./bin -xz -f {cni-plugins-amd64-v0.6.0.tgz}
 
 %install
 
-install -m 644 -d %{buildroot}%{_sysconfdir}/cni/net.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/cni/net.d/
 install -m 755 -d %{buildroot}/opt/cni
 mv bin/ %{buildroot}/opt/cni/