Add release v1.9.2

Merge pull request #2821 from weaveworks/issues/2820-busybox-modprobe
Ignore modprobe errors in weave-kube/launch.sh
2017-03-01 14:11:20 +00:00 · 2017-03-01 11:32:52 +00:00 · 2017-03-01 10:37:43 +00:00 · 2017-02-28 11:26:40 +00:00 · 2017-02-27 18:10:13 +00:00
4 changed files with 35 additions and 4 deletions
@@ -1,6 +1,15 @@
+## Release 1.9.2
+
+Bug fixes and minor improvements
+
+* Fix a weave-kube bug when `br_netfilter` or `xt_set` module is compiled into
+  kernel #2820/#2821
+* Detect the absence of the required `xt_set` kernel module #2821
+
 ## Release 1.9.1

-# Bug fixes and minor improvements
+Bug fixes and minor improvements
+
 * Fix a race condition when the Weave Net container is restarted
  which could allow a new container to be allocated the same IP
  address as an existing one #2784,#2787
@@ -14,7 +23,8 @@
  larger clusters can be created #2781
 * WeaveDNS was incorrectly case-sensitive for reverse DNS lookups #2817,#2818

-# Build and Testing
+Build and Testing
+
 * Scripts to create VMs to run automated tests were rewritten to use
  Terraform and Ansible, to make it much easier to test with different
  versions of components such as Docker and Kubernetes #2647,#2694,#2775,#2796
@@ -138,6 +138,8 @@ Finally, for **Mainline** releases only:
  published to https://www.weave.works
 * Add the new version of `weave-net` to the checkpoint system at
  https://checkpoint-api.weave.works/admin
+* File a PR to update the version of the daemonset at
+  https://github.com/kubernetes/kops/tree/master/upup/models/cloudup/resources/addons/networking.weave

 ## Troubleshooting

@@ -2,6 +2,23 @@

 set -e

+modprobe_safe() {
+    modprobe $1 || echo "Ignore the error if \"$1\" is built-in in the kernel" >&2
+}
+
+# Check whether xt_set actually exists
+xt_set_exists() {
+    ipset create weave-kube-test hash:ip
+    iptables -t filter -N WEAVE-KUBE-TEST
+    if ! iptables -A WEAVE-KUBE-TEST -m set --match-set weave-kube-test src -j DROP; then
+        NOT_EXIST=1
+    fi
+    iptables -F WEAVE-KUBE-TEST
+    iptables -X WEAVE-KUBE-TEST
+    ipset destroy weave-kube-test
+    [ -z "$NOT_EXIST" ] || (echo "\"xt_set\" does not exist" >&2 && return 1)
+}
+
 # Default if not supplied - same as weave net default
 IPALLOC_RANGE=${IPALLOC_RANGE:-10.32.0.0/12}
 HTTP_ADDR=${WEAVE_HTTP_ADDR:-127.0.0.1:6784}
@@ -17,8 +34,9 @@ EXPECT_NPC=${EXPECT_NPC:-1}

 # Ensure we have the required modules for NPC
 if [ "${EXPECT_NPC}" != "0" ]; then
-    modprobe br_netfilter
-    modprobe xt_set
+    modprobe_safe br_netfilter
+    modprobe_safe xt_set
+    xt_set_exists
 fi

 # kube-proxy requires that bridged traffic passes through netfilter
@@ -19,6 +19,7 @@ RUN apk add --update \
    curl \
    ethtool \
    iptables \
+    ipset \
    iproute2 \
    util-linux \
    conntrack-tools \
Author	SHA1	Message	Date
Martynas Pumputis	125f3cf6f6	Add release v1.9.2	2017-03-01 14:11:20 +00:00
Bryan Boreham	b2ffe77029	Merge pull request #2821 from weaveworks/issues/2820-busybox-modprobe Ignore modprobe errors in weave-kube/launch.sh	2017-03-01 11:32:52 +00:00
Martynas Pumputis	3607cf2d7a	Add check for xt_set module The check is based on actually trying to install an iptables rule which uses the module.	2017-03-01 10:37:43 +00:00
Martynas Pumputis	a57cf4bc83	Ignore modprobe errors in weave-kube/launch.sh weave-kube is run by alpine image which uses busybox. modprobe of busybox will return the "module not found" error [1], if a module is built-in, which is an opposite behavior to modprobe distributed in mainstream distros (e.g. ubuntu). [1]: https://bugs.busybox.net/show_bug.cgi?id=5270	2017-02-28 11:26:40 +00:00
Bryan Boreham	6036037817	Added kops update to the release instructions	2017-02-27 18:10:13 +00:00