Update from upstream

2021-01-25 13:00:00 +01:00 · 2021-01-25 13:00:00 +01:00 · 75fb29d1e2
commit 75fb29d1e2
parent d12d143ca7
14 changed files with 36 additions and 24 deletions
--- a/files/net/weave-net-ClusterRole.yaml
+++ b/files/net/weave-net-ClusterRole.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/net/weave-net-ClusterRoleBinding.yaml
+++ b/files/net/weave-net-ClusterRoleBinding.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/net/weave-net-DaemonSet.yaml
+++ b/files/net/weave-net-DaemonSet.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
@ -45,7 +45,9 @@ spec:
                fieldRef:
                  apiVersion: v1
                  fieldPath: spec.nodeName
-          image: 'docker.io/weaveworks/weave-kube:2.8.0'
+            - name: INIT_CONTAINER
+              value: 'true'
+          image: 'docker.io/weaveworks/weave-kube:2.8.1'
          readinessProbe:
            httpGet:
              host: 127.0.0.1
@ -60,16 +62,8 @@ spec:
          volumeMounts:
            - name: weavedb
              mountPath: /weavedb
-            - name: cni-bin
-              mountPath: /host/opt
-            - name: cni-bin2
-              mountPath: /host/home
-            - name: cni-conf
-              mountPath: /host/etc
            - name: dbus
              mountPath: /host/var/lib/dbus
-            - name: lib-modules
-              mountPath: /lib/modules
            - name: xtables-lock
              mountPath: /run/xtables.lock
        - name: weave-npc
@ -79,7 +73,7 @@ spec:
                fieldRef:
                  apiVersion: v1
                  fieldPath: spec.nodeName
-          image: 'docker.io/weaveworks/weave-npc:2.8.0'
+          image: 'docker.io/weaveworks/weave-npc:2.8.1'
          resources:
            requests:
              cpu: 50m
@ -91,6 +85,24 @@ spec:
              mountPath: /run/xtables.lock
      dnsPolicy: ClusterFirstWithHostNet
      hostNetwork: true
+      initContainers:
+        - name: weave-init
+          command:
+            - /home/weave/init.sh
+          image: 'docker.io/weaveworks/weave-kube:2.8.1'
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: cni-bin
+              mountPath: /host/opt
+            - name: cni-bin2
+              mountPath: /host/home
+            - name: cni-conf
+              mountPath: /host/etc
+            - name: lib-modules
+              mountPath: /lib/modules
+            - name: xtables-lock
+              mountPath: /run/xtables.lock
      priorityClassName: system-node-critical
      restartPolicy: Always
      securityContext:
--- a/files/net/weave-net-Role.yaml
+++ b/files/net/weave-net-Role.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/net/weave-net-RoleBinding.yaml
+++ b/files/net/weave-net-RoleBinding.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/net/weave-net-ServiceAccount.yaml
+++ b/files/net/weave-net-ServiceAccount.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/v1.16/net.yaml",
-          "date": "Mon Jan 18 2021 22:07:08 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-Namespace.yaml
+++ b/files/scope/weave-Namespace.yaml
@ -3,4 +3,4 @@ kind: Namespace
 metadata:
  name: weave
  annotations:
-    cloud.weave.works/version: v1.0.0-297-g10b75e5
+    cloud.weave.works/version: v1.0.0-300-ga96f12d
--- a/files/scope/weave-scope-ClusterRole.yaml
+++ b/files/scope/weave-scope-ClusterRole.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-ClusterRoleBinding.yaml
+++ b/files/scope/weave-scope-ClusterRoleBinding.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-ServiceAccount.yaml
+++ b/files/scope/weave-scope-ServiceAccount.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-agent-DaemonSet.yaml
+++ b/files/scope/weave-scope-agent-DaemonSet.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-app-Deployment.yaml
+++ b/files/scope/weave-scope-app-Deployment.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-app-Service.yaml
+++ b/files/scope/weave-scope-app-Service.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
--- a/files/scope/weave-scope-cluster-agent-Deployment.yaml
+++ b/files/scope/weave-scope-cluster-agent-Deployment.yaml
@ -7,7 +7,7 @@ metadata:
      {
        "original-request": {
          "url": "/k8s/1.13.1/scope.yaml",
-          "date": "Mon Jan 18 2021 22:07:07 GMT+0000 (UTC)"
+          "date": "Mon Jan 25 2021 11:56:21 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }