Update to version 1.18.2

5 files changed, 43 insertions, 8 deletions

diff --git a/10-kubeadm.conf b/10-kubeadm.conf
new file mode 100644
index 000000000000..dce41fdd65de
--- /dev/null
+++ b/10-kubeadm.conf
@@ -0,0 +1,11 @@
+# Note: This dropin only works with kubeadm and kubelet v1.11+
+[Service]
+Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
+Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
+# This is a file that "kubeadm init" and "kubeadm join" generate at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
+EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
+# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
+# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
+EnvironmentFile=-/etc/default/kubelet
+ExecStart=
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
diff --git a/50-kubeadm.conf b/50-kubeadm.conf
new file mode 100644
index 000000000000..a5d977316dd4
--- /dev/null
+++ b/50-kubeadm.conf
@@ -0,0 +1,2 @@
+# The file is provided as part of the kubeadm package
+net.ipv4.ip_forward = 1
diff --git a/PKGBUILD b/PKGBUILD
index bfb3608a544a..a8d2f9159bea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,25 @@
 
 pkgbase=kubernetes
 pkgname=(kubelet kubeadm)
-pkgver=1.17.0
+pkgver=1.18.2
 pkgrel=1
 arch=('x86_64')
 url="http://kubernetes.io/"
 pkgdesc="Production-Grade Container Scheduling and Management"
 makedepends=('go-pie' 'rsync')
 source=("kubernetes-$pkgver.tar.gz::https://dl.k8s.io/v$pkgver/kubernetes-src.tar.gz"
-	"kubelet.default")
+	"kubelet.default"
+	"kubelet.service"
+	"kubeadm.conf"
+	"10-kubeadm.conf"
+	"50-kubeadm.conf")
 license=("Apache")
-sha512sums=('5424576d7f7936df15243fee0036e7936d2d6224e98ac805ce96cdf7b83a7c5b66dfffc8823d7bc0c17c700fa3c01841208e8cf89be91d237d12e18f3d2f307c'
-            'bd8bfcb4de9866e1e61beb37d8caae5f553fb406744c62bee226033dde746c11b47a536b1557664fe7cacb0c702234e08561e7460426e25667fe7e1e9b913adc')
+sha512sums=('0915b658c53b9bad1b3913470cb6728bc51fd49e8ac7778d4653c7271642d56a51ae83e58b9a1829a8df8970e73411f02c5ab277f8a9ba4befc4ba933800a9c5'
+            'bd8bfcb4de9866e1e61beb37d8caae5f553fb406744c62bee226033dde746c11b47a536b1557664fe7cacb0c702234e08561e7460426e25667fe7e1e9b913adc'
+            'b9ca0db34fea67dfd0654e65d3898a72997b1360c1e802cab5adc4288199c1a08423f90751757af4a7f1ff5932bfd81d3e215ce9b9d3f4efa1c04a202228adc8'
+            'b97703490fb00caf3eb7f670632a897209da344ce3b869f262c855ffe2dae8c11c1b25d5642019d0733c6ac975f451794e49ce27fca3d02611bf1de5f5fa56d6'
+            'db6ee01c114d8bfc68eabd27a91b50acd017b82f8d044b08b1fba672846bec6c8c20c775113b8a6d1b81b3bf8b61c2b344856b16f1115e9eea3947e21a6bc378'
+            'ed5ba22b37eaa9f4950ff3b57d60dd7866fcd5b8bd5197eab3170470528e8d91379483d3eb724589e695184f9b0ed506ebaee73ecca0dc40afdb5f35e79d178a')
 
 build() {
     make WHAT="cmd/kubelet cmd/kubeadm"
@@ -28,7 +36,7 @@ package_kubelet() {
 
     install -Dm755 _output/bin/kubelet -t "$pkgdir/usr/bin"
 
-    install -Dm644 build/debs/kubelet.service -t "$pkgdir/usr/lib/systemd/system"
+    install -Dm644 kubelet.service -t "$pkgdir/usr/lib/systemd/system"
     install -Dm644 kubelet.default "$pkgdir/etc/default/kubelet"
 }
 
@@ -38,9 +46,9 @@ package_kubeadm() {
 
     install -Dm755 _output/bin/kubeadm -t "$pkgdir/usr/bin"
 
-    install -Dm644 build/debs/kubeadm.conf -t "$pkgdir/usr/lib/modules-load.d"
-    install -Dm644 build/debs/10-kubeadm.conf -t "$pkgdir/etc/systemd/system/kubelet.service.d"
-    install -Dm644 build/debs/50-kubeadm.conf -t "$pkgdir/etc/sysctl.d"
+    install -Dm644 kubeadm.conf -t "$pkgdir/usr/lib/modules-load.d"
+    install -Dm644 10-kubeadm.conf -t "$pkgdir/etc/systemd/system/kubelet.service.d"
+    install -Dm644 50-kubeadm.conf -t "$pkgdir/etc/sysctl.d"
 
     "$pkgdir/usr/bin/kubeadm" completion bash | install -Dm644 /dev/stdin "$pkgdir/usr/share/bash-completion/completions/kubeadm"
     "$pkgdir/usr/bin/kubeadm" completion zsh | install -Dm644 /dev/stdin "$pkgdir/usr/share/zsh/site-functions/_kubeadm"
diff --git a/kubeadm.conf b/kubeadm.conf
new file mode 100644
index 000000000000..4b3e02da8cce
--- /dev/null
+++ b/kubeadm.conf
@@ -0,0 +1,2 @@
+# Load br_netfilter module at boot
+br_netfilter
diff --git a/kubelet.service b/kubelet.service
new file mode 100644
index 000000000000..9712664deaf9
--- /dev/null
+++ b/kubelet.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=kubelet: The Kubernetes Node Agent
+Documentation=http://kubernetes.io/docs/
+
+[Service]
+ExecStart=/usr/bin/kubelet
+Restart=always
+StartLimitInterval=0
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target