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

Add ACI-CNI 6.1.1.2 variables

Browse Source
This commit is contained in:
JeffinKottaram 2024-12-30 01:16:59 -08:00
parent be7113f1fa
commit 42f2138d90
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/defaults.go
View File

@ -145,6 +145,7 @@ const (
DefaultAciOpflexSwitchSyncDelay = "5" DefaultAciOpflexSwitchSyncDelay = "5"
DefaultAciOpflexSwitchSyncDynamic = "10" DefaultAciOpflexSwitchSyncDynamic = "10"
DefaultAciEnableHppDirect = "false" DefaultAciEnableHppDirect = "false"
DefaultAciProactiveConf = "false"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@ -931,6 +932,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit) setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode) setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect) setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ProactiveConf, DefaultAciProactiveConf)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DropLogDisableEvents, DefaultAciDropLogDisableEvents) setDefaultIfEmpty(&c.Network.AciNetworkProvider.DropLogDisableEvents, DefaultAciDropLogDisableEvents)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration)
@ -1053,6 +1055,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciEnableHppDirect] = c.Network.AciNetworkProvider.EnableHppDirect networkPluginConfigDefaultsMap[AciEnableHppDirect] = c.Network.AciNetworkProvider.EnableHppDirect
networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay
networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs
networkPluginConfigDefaultsMap[AciProactiveConf] = c.Network.AciNetworkProvider.ProactiveConf
} }
for k, v := range networkPluginConfigDefaultsMap { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

3
cluster/network.go
View File

@ -190,6 +190,7 @@ const (
AciUnknownMacUnicastAction = "aci_unknown_mac_unicast_action" AciUnknownMacUnicastAction = "aci_unknown_mac_unicast_action"
AciEnableHppDirect = "aci_enable_hpp_direct" AciEnableHppDirect = "aci_enable_hpp_direct"
AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_delay" AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_delay"
AciProactiveConf = "aci_proactive_conf"
// List of map keys to be used with network templates // List of map keys to be used with network templates
// EtcdEndpoints is the server address for Etcd, used by calico // EtcdEndpoints is the server address for Etcd, used by calico
@ -374,6 +375,7 @@ const (
UnknownMacUnicastAction = "UnknownMacUnicastAction" UnknownMacUnicastAction = "UnknownMacUnicastAction"
EnableHppDirect = "EnableHppDirect" EnableHppDirect = "EnableHppDirect"
OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay" OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay"
ProactiveConf = "ProactiveConf"
) )
type IPPool struct { type IPPool struct {
@ -752,6 +754,7 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
UnknownMacUnicastAction: c.Network.Options[AciUnknownMacUnicastAction], UnknownMacUnicastAction: c.Network.Options[AciUnknownMacUnicastAction],
EnableHppDirect: c.Network.Options[AciEnableHppDirect], EnableHppDirect: c.Network.Options[AciEnableHppDirect],
OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay], OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay],
ProactiveConf: c.Network.Options[AciProactiveConf],
AciCniDeployContainer: c.SystemImages.AciCniDeployContainer, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,
AciOpflexContainer: c.SystemImages.AciOpflexContainer, AciOpflexContainer: c.SystemImages.AciOpflexContainer,

1
types/rke_types.go
View File

@ -712,6 +712,7 @@ type AciNetworkProvider struct {
UnknownMacUnicastAction string `yaml:"unknown_mac_unicast_action,omitempty" json:"unknownMacUnicastAction,omitempty"` UnknownMacUnicastAction string `yaml:"unknown_mac_unicast_action,omitempty" json:"unknownMacUnicastAction,omitempty"`
EnableHppDirect string `yaml:"enable_hpp_direct,omitempty" json:"enableHppDirect,omitempty"` EnableHppDirect string `yaml:"enable_hpp_direct,omitempty" json:"enableHppDirect,omitempty"`
OpflexAgentResetWaitDelay string `yaml:"opflex_agent_reset_wait_delay,omitempty" json:"opflexAgentResetWaitDelay,omitempty"` OpflexAgentResetWaitDelay string `yaml:"opflex_agent_reset_wait_delay,omitempty" json:"opflexAgentResetWaitDelay,omitempty"`
ProactiveConf string `yaml:"proactive_conf,omitempty" json:"proactiveConf,omitempty"`
} }
type KubernetesServicesOptions struct { type KubernetesServicesOptions struct {