Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce machine, cluster charts to single instances
[icn.git]
/
deploy
/
cluster
/
templates
/
flannel-addon.yaml
diff --git
a/deploy/clusters/templates/flannel-addon.yaml
b/deploy/cluster/templates/flannel-addon.yaml
similarity index 97%
rename from
deploy/clusters/templates/flannel-addon.yaml
rename to
deploy/cluster/templates/flannel-addon.yaml
index
ea560a4
..
d560501
100644
(file)
--- a/
deploy/clusters/templates/flannel-addon.yaml
+++ b/
deploy/cluster/templates/flannel-addon.yaml
@@
-1,5
+1,4
@@
-{{- range $clusterName, $cluster := .Values.clusters }}
-{{- if eq $cluster.cni "flannel" }}
+{{- if eq .Values.cni "flannel" }}
---
apiVersion: v1
data:
---
apiVersion: v1
data:
@@
-131,7
+130,7
@@
data:
}
net-conf.json: |
{
}
net-conf.json: |
{
- "Network": "{{
$cluster
.podCidr }}",
+ "Network": "{{
.Values
.podCidr }}",
"Backend": {
"Type": "vxlan"
}
"Backend": {
"Type": "vxlan"
}
@@
-244,6
+243,5
@@
data:
kind: ConfigMap
metadata:
creationTimestamp: null
kind: ConfigMap
metadata:
creationTimestamp: null
- name: {{ $clusterName }}-flannel-addon
-{{- end }}
+ name: {{ .Values.clusterName }}-flannel-addon
{{- end }}
{{- end }}