From fe61992c0675af90a08612e9ef98a83384b26b9d Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 12 Jan 2021 13:51:01 +0000
Subject: [PATCH] Make launch.sh compatible with older k8s manifests

---
 prog/weave-kube/launch.sh                     | 3 +++
 prog/weave-kube/weave-daemonset-k8s-1.11.yaml | 2 ++
 prog/weave-kube/weave-daemonset-k8s-1.8.yaml  | 2 ++
 prog/weave-kube/weave-daemonset-k8s-1.9.yaml  | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index aec5b1e8..4de1513d 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -3,6 +3,9 @@
 
 set -e
 
+# If this is run from an older manifest, run the init script here
+[ "${INIT_CONTAINER}" = "true" ] || "$(dirname "$0")/init.sh"
+
 # Setup iptables backend to be legacy or nftable
 setup_iptables_backend() {
     if [ -n "${IPTABLES_BACKEND}" ]; then
diff --git a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml
index 0ba49b72..af56ecf7 100644
--- a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml
+++ b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml
@@ -144,6 +144,8 @@ items:
               command:
                 - /home/weave/launch.sh
               env:
+                - name: INIT_CONTAINER
+                  value: "true"
                 - name: HOSTNAME
                   valueFrom:
                     fieldRef:
diff --git a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml
index 21c99d8e..35e248fa 100644
--- a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml
+++ b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml
@@ -141,6 +141,8 @@ items:
               command:
                 - /home/weave/launch.sh
               env:
+                - name: INIT_CONTAINER
+                  value: "true"
                 - name: HOSTNAME
                   valueFrom:
                     fieldRef:
diff --git a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml
index 89c9d698..18fdb44d 100644
--- a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml
+++ b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml
@@ -144,6 +144,8 @@ items:
               command:
                 - /home/weave/launch.sh
               env:
+                - name: INIT_CONTAINER
+                  value: "true"
                 - name: HOSTNAME
                   valueFrom:
                     fieldRef: