Merge pull request #3755 from noironetworks/aci-6044-rke-1.6.5

rancher · Dec 6, 2024 · 22242f0 · 22242f0
2 parents 59f19b9 + 77153d0
commit 22242f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/cluster/defaults.go b/cluster/defaults.go
@@ -1052,6 +1052,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction
 		networkPluginConfigDefaultsMap[AciEnableHppDirect] = c.Network.AciNetworkProvider.EnableHppDirect
 		networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay
+		networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs
 	}
 	for k, v := range networkPluginConfigDefaultsMap {
 		setDefaultIfEmptyMapValue(c.Network.Options, k, v)

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

diff --git a/types/rke_types.go b/types/rke_types.go
@@ -703,6 +703,7 @@ type AciNetworkProvider struct {
 	ApicConnectionRetryLimit             string              `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"`
 	TaintNotReadyNode                    string              `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,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"`
 	OpflexStartupPolicyDuration          string              `yaml:"opflex_startup_policy_duration,omitempty" json:"opflexStartupPolicyDuration,omitempty"`
 	OpflexStartupResolveAftConn          string              `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"`