Code Review
/
ta
/
caas-danm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change default network to ClusterNetwork
[ta/caas-danm.git]
/
ansible
/
roles
/
flannel
/
templates
/
flannel_cnet.yaml.j2
diff --git
a/ansible/roles/flannel/templates/flannel_tnet.yaml.j2
b/ansible/roles/flannel/templates/flannel_cnet.yaml.j2
similarity index 91%
rename from
ansible/roles/flannel/templates/flannel_tnet.yaml.j2
rename to
ansible/roles/flannel/templates/flannel_cnet.yaml.j2
index
2dfacf8
..
e8471e3
100644
(file)
--- a/
ansible/roles/flannel/templates/flannel_tnet.yaml.j2
+++ b/
ansible/roles/flannel/templates/flannel_cnet.yaml.j2
@@
-15,10
+15,9
@@
limitations under the License.
#}
---
apiVersion: danm.k8s.io/v1
#}
---
apiVersion: danm.k8s.io/v1
-kind:
Tenant
Network
+kind:
Cluster
Network
metadata:
name: {{ caas.danmnet_default_name }}
metadata:
name: {{ caas.danmnet_default_name }}
- namespace: {{ caas.danmnet_default_namespace }}
spec:
NetworkID: {{ caas.danmnet_default_network_id }}
NetworkType: {{ caas.danmnet_default_network_type }}
spec:
NetworkID: {{ caas.danmnet_default_network_id }}
NetworkType: {{ caas.danmnet_default_network_type }}