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

This commit is contained in:
Adrien Reslinger 2021-01-25 13:00:00 +01:00
parent d12d143ca7
commit 75fb29d1e2
Signed by: adrien
GPG key ID: DA7B27055C66D6DE
14 changed files with 36 additions and 24 deletions

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }
@ -45,7 +45,9 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName 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: readinessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
@ -60,16 +62,8 @@ spec:
volumeMounts: volumeMounts:
- name: weavedb - name: weavedb
mountPath: /weavedb mountPath: /weavedb
- name: cni-bin
mountPath: /host/opt
- name: cni-bin2
mountPath: /host/home
- name: cni-conf
mountPath: /host/etc
- name: dbus - name: dbus
mountPath: /host/var/lib/dbus mountPath: /host/var/lib/dbus
- name: lib-modules
mountPath: /lib/modules
- name: xtables-lock - name: xtables-lock
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
- name: weave-npc - name: weave-npc
@ -79,7 +73,7 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: 'docker.io/weaveworks/weave-npc:2.8.0' image: 'docker.io/weaveworks/weave-npc:2.8.1'
resources: resources:
requests: requests:
cpu: 50m cpu: 50m
@ -91,6 +85,24 @@ spec:
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
hostNetwork: true 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 priorityClassName: system-node-critical
restartPolicy: Always restartPolicy: Always
securityContext: securityContext:

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/v1.16/net.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -3,4 +3,4 @@ kind: Namespace
metadata: metadata:
name: weave name: weave
annotations: annotations:
cloud.weave.works/version: v1.0.0-297-g10b75e5 cloud.weave.works/version: v1.0.0-300-ga96f12d

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }

View file

@ -7,7 +7,7 @@ metadata:
{ {
"original-request": { "original-request": {
"url": "/k8s/1.13.1/scope.yaml", "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" "email-address": "support@weave.works"
} }