rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-10-22 03:32:19 +00:00
Code Issues Releases Wiki Activity

Fix Weave Template

Browse Source
This commit is contained in:
galal-hussein
2019-01-30 00:38:22 +02:00
committed by Alena Prokharchyk
parent 642970feb2
commit 11b5757207
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/weave.go
View File

@@ -21,6 +21,9 @@ items:
spec: spec:
template: template:
metadata: metadata:
annotations:
scheduler.alpha.kubernetes.io/tolerations: >-
[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]
labels: labels:
name: weave-net name: weave-net
spec: spec:
@@ -50,7 +53,7 @@ items:
value: "{{.WeavePassword}}" value: "{{.WeavePassword}}"
{{- end}} {{- end}}
image: {{.Image}} image: {{.Image}}
livenessProbe: readinessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
path: /status path: /status
@@ -77,7 +80,6 @@ items:
- name: xtables-lock - name: xtables-lock
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
- name: weave-npc - name: weave-npc
args: []
env: env:
- name: HOSTNAME - name: HOSTNAME
valueFrom: valueFrom:
@@ -93,9 +95,9 @@ items:
volumeMounts: volumeMounts:
- name: xtables-lock - name: xtables-lock
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
- name: weave-loopback - name: weave-plugins
command: command:
- /opt/rke-tools/weave-loopback-cni.sh - /opt/rke-tools/weave-plugins-cni.sh
image: {{.WeaveLoopbackImage}} image: {{.WeaveLoopbackImage}}
securityContext: securityContext:
privileged: true privileged: true
@@ -109,14 +111,10 @@ items:
seLinuxOptions: {} seLinuxOptions: {}
serviceAccountName: weave-net serviceAccountName: weave-net
tolerations: tolerations:
- key: "node-role.kubernetes.io/controlplane" - operator: Exists
operator: "Exists" effect: NoSchedule
effect: "NoSchedule" - operator: Exists
- key: "node-role.kubernetes.io/etcd" effect: NoExecute
operator: "Exists"
effect: "NoExecute"
- effect: NoExecute
operator: Exists
volumes: volumes:
- name: weavedb - name: weavedb
hostPath: hostPath: