Sync from upstream
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Adrien Reslinger 2020-10-17 01:12:38 +02:00
parent 06f66334cf
commit 9c7539208e
14 changed files with 24 additions and 18 deletions

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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:

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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