openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Calico: Expose CNI network config to values.yaml"

Browse Source
This commit is contained in:
Zuul 2018-01-07 01:57:45 +00:00 committed by Gerrit Code Review
commit b5553893a2
2 changed files with 18 additions and 19 deletions

20
calico/templates/configmap-calico-config.yaml

@ -32,23 +32,5 @@ data:
# The CNI network configuration to install on each node.
cni_network_config: |-
{
"name": "k8s-pod-network",
"cniVersion": "0.1.0",
"type": "calico",
"etcd_endpoints": "__ETCD_ENDPOINTS__",
"log_level": "info",
"mtu": 1500,
"ipam": {
"type": "calico-ipam"
},
"policy": {
"type": "k8s",
"k8s_api_root": "https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__",
"k8s_auth_token": "__SERVICEACCOUNT_TOKEN__"
},
"kubernetes": {
"kubeconfig": "/etc/cni/net.d/__KUBECONFIG_FILENAME__"
}
}
{{ toJson $envAll.Values.conf.cni_network_config | indent 4 }}
{{- end }}

17
calico/values.yaml

@ -107,6 +107,23 @@ endpoints:
networking:
podSubnet: 192.168.0.0/16
conf:
cni_network_config:
name: k8s-pod-network
cniVersion: 0.1.0
type: calico
etcd_endpoints: __ETCD_ENDPOINTS__
log_level: info
mtu: 1500
ipam:
type: calico-ipam
policy:
type: k8s
k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
k8s_auth_token: __SERVICEACCOUNT_TOKEN__
kubernetes:
kubeconfig: "/etc/cni/net.d/__KUBECONFIG_FILENAME__"
manifests:
configmap_bin: true
configmap_calico_config: true