Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Replace flannel with calico
[icn.git]
/
deploy
/
cluster
/
templates
/
kubeadmconfigtemplate.yaml
diff --git
a/deploy/cluster/templates/kubeadmconfigtemplate.yaml
b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
index
c2858d6
..
22463d5
100644
(file)
--- a/
deploy/cluster/templates/kubeadmconfigtemplate.yaml
+++ b/
deploy/cluster/templates/kubeadmconfigtemplate.yaml
@@
-50,6
+50,11
@@
spec:
permissions: '0777'
content: |
{{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 10 }}
permissions: '0777'
content: |
{{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 10 }}
+{{- if eq .Values.cni "calico" }}
+ - path: /etc/NetworkManager/conf.d/calico.conf
+ content: |
+{{ $.Files.Get "resources/calico.conf" | indent 10 }}
+{{- end }}
{{- if .Values.userData }}
users:
- name: {{ .Values.userData.name }}
{{- if .Values.userData }}
users:
- name: {{ .Values.userData.name }}