rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-21 16:23:05 +00:00
Code Issues Releases Wiki Activity

Add ACI-CNI 6.0.4.4 variables

Browse Source
This commit is contained in:
Akhilesh Sarda 2024-11-26 04:15:44 -05:00 committed by JeffinKottaram
parent 59f19b930c
commit 77153d0b09
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/defaults.go
View File

@ -1052,6 +1052,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction
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
} }
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

@ -181,6 +181,7 @@ const (
AciApicConnectionRetryLimit = "aci_apic_connection_retry_limit" AciApicConnectionRetryLimit = "aci_apic_connection_retry_limit"
AciTaintNotReadyNode = "aci_taint_not_ready_node" AciTaintNotReadyNode = "aci_taint_not_ready_node"
AciDropLogDisableEvents = "aci_drop_log_disable_events" AciDropLogDisableEvents = "aci_drop_log_disable_events"
AciDropLogOpflexRedirectDropLogs = "aci_drop_log_opflex_redirect_drop_logs"
AciOpflexStartupEnabled = "aci_opflex_startup_enabled" AciOpflexStartupEnabled = "aci_opflex_startup_enabled"
AciOpflexStartupPolicyDuration = "aci_opflex_startup_policy_duration" AciOpflexStartupPolicyDuration = "aci_opflex_startup_policy_duration"
AciOpflexStartupResolveAftConn = "aci_opflex_startup_resolve_aft_conn" AciOpflexStartupResolveAftConn = "aci_opflex_startup_resolve_aft_conn"
@ -364,6 +365,7 @@ const (
ApicConnectionRetryLimit = "ApicConnectionRetryLimit" ApicConnectionRetryLimit = "ApicConnectionRetryLimit"
TaintNotReadyNode = "TaintNotReadyNode" TaintNotReadyNode = "TaintNotReadyNode"
DropLogDisableEvents = "DropLogDisableEvents" DropLogDisableEvents = "DropLogDisableEvents"
DropLogOpflexRedirectDropLogs = "DropLogOpflexRedirectDropLogs"
OpflexStartupEnabled = "OpflexStartupEnabled" OpflexStartupEnabled = "OpflexStartupEnabled"
OpflexStartupPolicyDuration = "OpflexStartupPolicyDuration" OpflexStartupPolicyDuration = "OpflexStartupPolicyDuration"
OpflexStartupResolveAftConn = "OpflexStartupResolveAftConn" OpflexStartupResolveAftConn = "OpflexStartupResolveAftConn"
@ -740,6 +742,7 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
ApicConnectionRetryLimit: c.Network.Options[AciApicConnectionRetryLimit], ApicConnectionRetryLimit: c.Network.Options[AciApicConnectionRetryLimit],
TaintNotReadyNode: c.Network.Options[AciTaintNotReadyNode], TaintNotReadyNode: c.Network.Options[AciTaintNotReadyNode],
DropLogDisableEvents: c.Network.Options[AciDropLogDisableEvents], DropLogDisableEvents: c.Network.Options[AciDropLogDisableEvents],
DropLogOpflexRedirectDropLogs: c.Network.Options[AciDropLogOpflexRedirectDropLogs],
NodeSnatRedirectExclude: c.Network.AciNetworkProvider.NodeSnatRedirectExclude, NodeSnatRedirectExclude: c.Network.AciNetworkProvider.NodeSnatRedirectExclude,
OpflexStartupEnabled: c.Network.Options[AciOpflexStartupEnabled], OpflexStartupEnabled: c.Network.Options[AciOpflexStartupEnabled],
OpflexStartupPolicyDuration: c.Network.Options[AciOpflexStartupPolicyDuration], OpflexStartupPolicyDuration: c.Network.Options[AciOpflexStartupPolicyDuration],

1
types/rke_types.go
View File

@ -703,6 +703,7 @@ type AciNetworkProvider struct {
ApicConnectionRetryLimit string `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"` ApicConnectionRetryLimit string `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"`
TaintNotReadyNode string `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,omitempty"` TaintNotReadyNode string `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,omitempty"`
DropLogDisableEvents string `yaml:"drop_log_disable_events,omitempty" json:"dropLogDisableEvents,omitempty"` DropLogDisableEvents string `yaml:"drop_log_disable_events,omitempty" json:"dropLogDisableEvents,omitempty"`
DropLogOpflexRedirectDropLogs string `yaml:"drop_log_opflex_redirect_drop_logs,omitempty" json:"dropLogOpflexRedirectDropLogs,omitempty"`
OpflexStartupEnabled string `yaml:"opflex_startup_enabled,omitempty" json:"opflexStartupEnabled,omitempty"` OpflexStartupEnabled string `yaml:"opflex_startup_enabled,omitempty" json:"opflexStartupEnabled,omitempty"`
OpflexStartupPolicyDuration string `yaml:"opflex_startup_policy_duration,omitempty" json:"opflexStartupPolicyDuration,omitempty"` OpflexStartupPolicyDuration string `yaml:"opflex_startup_policy_duration,omitempty" json:"opflexStartupPolicyDuration,omitempty"`
OpflexStartupResolveAftConn string `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"` OpflexStartupResolveAftConn string `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"`