From 9c7539208eade0da8c3b31311b6310d181594f4e Mon Sep 17 00:00:00 2001 From: Adrien Date: Sat, 17 Oct 2020 01:12:38 +0200 Subject: [PATCH] Sync from upstream --- files/net/weave-net-ClusterRole.yaml | 2 +- files/net/weave-net-ClusterRoleBinding.yaml | 2 +- files/net/weave-net-DaemonSet.yaml | 12 +++++++----- files/net/weave-net-Role.yaml | 2 +- files/net/weave-net-RoleBinding.yaml | 2 +- files/net/weave-net-ServiceAccount.yaml | 2 +- files/scope/weave-Namespace.yaml | 2 +- files/scope/weave-scope-ClusterRole.yaml | 2 +- files/scope/weave-scope-ClusterRoleBinding.yaml | 2 +- files/scope/weave-scope-ServiceAccount.yaml | 2 +- files/scope/weave-scope-agent-DaemonSet.yaml | 4 +++- files/scope/weave-scope-app-Deployment.yaml | 2 +- files/scope/weave-scope-app-Service.yaml | 2 +- .../scope/weave-scope-cluster-agent-Deployment.yaml | 4 +++- 14 files changed, 24 insertions(+), 18 deletions(-) diff --git a/files/net/weave-net-ClusterRole.yaml b/files/net/weave-net-ClusterRole.yaml index 79e3310..e5d3d33 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-ClusterRoleBinding.yaml b/files/net/weave-net-ClusterRoleBinding.yaml index 04b3e90..02cfca2 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-DaemonSet.yaml b/files/net/weave-net-DaemonSet.yaml index 685e72b..a3416a6 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } @@ -45,7 +45,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'docker.io/weaveworks/weave-kube:2.6.5' + image: 'docker.io/weaveworks/weave-kube:2.7.0' readinessProbe: httpGet: host: 127.0.0.1 @@ -53,7 +53,8 @@ spec: port: 6784 resources: requests: - cpu: 10m + cpu: 50m + memory: 100Mi securityContext: privileged: true volumeMounts: @@ -78,10 +79,11 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'docker.io/weaveworks/weave-npc:2.6.5' + image: 'docker.io/weaveworks/weave-npc:2.7.0' resources: requests: - cpu: 10m + cpu: 50m + memory: 100Mi securityContext: privileged: true volumeMounts: diff --git a/files/net/weave-net-Role.yaml b/files/net/weave-net-Role.yaml index b2a9b8e..9811b94 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-RoleBinding.yaml b/files/net/weave-net-RoleBinding.yaml index ecf20be..33db159 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/net/weave-net-ServiceAccount.yaml b/files/net/weave-net-ServiceAccount.yaml index d493906..4317f5a 100644 --- 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": "Wed Jun 10 2020 20:07:23 GMT+0000 (UTC)" + "date": "Fri Oct 16 2020 23:10:48 GMT+0000 (UTC)" }, "email-address": "support@weave.works" } diff --git a/files/scope/weave-Namespace.yaml b/files/scope/weave-Namespace.yaml index 6fe4bbf..66d4a7e 100644 --- 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-269-gffdc830 + cloud.weave.works/version: v1.0.0-291-gc71faa9 diff --git a/files/scope/weave-scope-ClusterRole.yaml b/files/scope/weave-scope-ClusterRole.yaml index 342461e..a47b192 100644 --- 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": "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" } diff --git a/files/scope/weave-scope-ClusterRoleBinding.yaml b/files/scope/weave-scope-ClusterRoleBinding.yaml index 78b0bc9..26b668b 100644 --- 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": "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" } diff --git a/files/scope/weave-scope-ServiceAccount.yaml b/files/scope/weave-scope-ServiceAccount.yaml index b6ffe94..f83ed9a 100644 --- 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": "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" } diff --git a/files/scope/weave-scope-agent-DaemonSet.yaml b/files/scope/weave-scope-agent-DaemonSet.yaml index 70eeadb..c0abea3 100644 --- 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 diff --git a/files/scope/weave-scope-app-Deployment.yaml b/files/scope/weave-scope-app-Deployment.yaml index 9edb74e..7d23e17 100644 --- 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": "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" } diff --git a/files/scope/weave-scope-app-Service.yaml b/files/scope/weave-scope-app-Service.yaml index c065368..96495a0 100644 --- 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": "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" } diff --git a/files/scope/weave-scope-cluster-agent-Deployment.yaml b/files/scope/weave-scope-cluster-agent-Deployment.yaml index e2ba165..e6a4019 100644 --- 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": "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" } @@ -53,6 +53,8 @@ spec: - containerPort: 4041 protocol: TCP resources: + limits: + memory: 2000Mi requests: cpu: 25m memory: 80Mi