rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 13:18:47 +00:00
Code Issues Releases Wiki Activity

Add custom flexvolume capabilities to canal and calico

Browse Source
This commit is contained in:
Chris Kim
2020-02-21 10:52:18 -08:00
parent 64f0d7808d
commit 97371fe82d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/defaults.go
View File

@@ -65,6 +65,10 @@ const (
DefaultFlannelBackendVxLanPort = "8472"
DefaultFlannelBackendVxLanVNI = "1"
DefaultCalicoFlexVolPluginDirectory = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/nodeagent~uds"
DefaultCanalFlexVolPluginDirectory = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/nodeagent~uds"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@@ -503,7 +507,8 @@ func (c *Cluster) setClusterNetworkDefaults() {
switch c.Network.Plugin {
case CalicoNetworkPlugin:
networkPluginConfigDefaultsMap = map[string]string{
CalicoCloudProvider: DefaultNetworkCloudProvider,
CalicoCloudProvider: DefaultNetworkCloudProvider,
CalicoFlexVolPluginDirectory: DefaultCalicoFlexVolPluginDirectory,
}
case FlannelNetworkPlugin:
networkPluginConfigDefaultsMap = map[string]string{
@@ -516,6 +521,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
CanalFlannelBackendType: DefaultFlannelBackendVxLan,
CanalFlannelBackendPort: DefaultFlannelBackendVxLanPort,
CanalFlannelBackendVxLanNetworkIdentify: DefaultFlannelBackendVxLanVNI,
CanalFlexVolPluginDirectory: DefaultCanalFlexVolPluginDirectory,
}
}
if c.Network.CalicoNetworkProvider != nil {