Sync from upstream

2020-10-17 01:12:38 +02:00 · 2020-10-17 01:12:38 +02:00 · 9c7539208e
commit 9c7539208e
parent 06f66334cf
14 changed files with 24 additions and 18 deletions
--- 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": "Wed Jun 10 2020 20:07:21 GMT+0000 (UTC)"
+          "date": "Fri Oct 16 2020 23:10:47 GMT+0000 (UTC)"
        },
        "email-address": "support@weave.works"
      }
@ -50,6 +50,8 @@ spec:
          image: 'docker.io/weaveworks/scope:1.13.1'
          imagePullPolicy: IfNotPresent
          resources:
+            limits:
+              memory: 2000Mi
            requests:
              cpu: 100m
              memory: 100Mi