Merge branch 'master' into use-iptables-from-host

This commit is contained in:
Miguel Angel Ajo Pelayo
2019-09-03 16:46:17 +02:00
committed by GitHub
+5 -1
View File
@@ -37,6 +37,10 @@ spec:
value: "{{ .Values.submariner.clusterId }}" value: "{{ .Values.submariner.clusterId }}"
- name: SUBMARINER_DEBUG - name: SUBMARINER_DEBUG
value: "{{ .Values.submariner.debug }}" value: "{{ .Values.submariner.debug }}"
- name: SUBMARINER_CLUSTERCIDR
value: "{{ .Values.submariner.clusterCidr }}"
- name: SUBMARINER_SERVICECIDR
value: "{{ .Values.submariner.serviceCidr }}"
resources: resources:
{{ toYaml .Values.routeAgent.resources | indent 10 }} {{ toYaml .Values.routeAgent.resources | indent 10 }}
securityContext: securityContext:
@@ -67,4 +71,4 @@ spec:
volumes: volumes:
- name: host-slash - name: host-slash
hostPath: hostPath:
path: / path: /