From 666631134cf6656e798f87da1c962abd5ab44919 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Thu, 1 Jun 2017 16:07:42 +0100
Subject: [PATCH 1/2] Update YAMLs to be what the Launch Generator serves.

See also: weaveworks/launch-generator/pull/117

Command used:
```
$ curl -fsSo prog/weave-kube/weave-daemonset-k8s-1.6.yaml "https://cloud.weave.works/k8s/v1.6/net?v=latest"
$ curl -fsSo prog/weave-kube/weave-daemonset.yaml "https://cloud.weave.works/k8s/v1.5/net?v=latest"
```
Annotations then removed.
---
 prog/weave-kube/weave-daemonset-k8s-1.6.yaml | 3 +--
 prog/weave-kube/weave-daemonset.yaml         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml
index 0a2f0a92..90923401 100644
--- a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml
+++ b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml
@@ -106,8 +106,7 @@ items:
           hostPID: true
           restartPolicy: Always
           securityContext:
-            seLinuxOptions:
-              type: spc_t
+            seLinuxOptions: {}
           serviceAccountName: weave-net
           tolerations:
             - effect: NoSchedule
diff --git a/prog/weave-kube/weave-daemonset.yaml b/prog/weave-kube/weave-daemonset.yaml
index 2987d04e..555cbea3 100644
--- a/prog/weave-kube/weave-daemonset.yaml
+++ b/prog/weave-kube/weave-daemonset.yaml
@@ -70,8 +70,7 @@ items:
           hostPID: true
           restartPolicy: Always
           securityContext:
-            seLinuxOptions:
-              type: spc_t
+            seLinuxOptions: {}
           serviceAccountName: weave-net
           volumes:
             - name: weavedb

From 2e2b667864064dbd0354e02c28b2da2108cc3e35 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Thu, 1 Jun 2017 16:22:35 +0100
Subject: [PATCH 2/2] Document Launch Generator's seLinuxOptions.NAME=VALUE.

---
 site/kube-addon.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/kube-addon.md b/site/kube-addon.md
index 522f52b3..3b47fefb 100644
--- a/site/kube-addon.md
+++ b/site/kube-addon.md
@@ -216,6 +216,7 @@ If the YAML file is from `cloud.weave.works` as described above, then you can cu
   - `trusted-subnets`: comma-separated list of CIDRs. Default: empty.
   - `disable-npc`: boolean (`true|false`). Default: `false`.
   - `env.NAME=VALUE`: add environment variable `NAME` and set it to `VALUE`.
+  - `seLinuxOptions.NAME=VALUE`: add SELinux option `NAME` and set it to `VALUE`, e.g. `seLinuxOptions.type=spc_t`
 
 The list of variables you can set is: