Merge pull request #3765 from noironetworks/aci-6112-v1.7

[release/v1.7] Add ACI-CNI 6.1.1.2 variables
rancher · Jan 7, 2025 · bf9d23a · bf9d23a
2 parents be7113f + a7c712c
commit bf9d23a
Show file tree

Hide file tree

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

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

diff --git a/data/bindata.go b/data/bindata.go
diff --git a/data/data.json b/data/data.json
diff --git a/types/kdm/zz_generated_deepcopy.go b/types/kdm/zz_generated_deepcopy.go
diff --git a/types/rke_types.go b/types/rke_types.go
@@ -712,6 +712,7 @@ type AciNetworkProvider struct {
 	UnknownMacUnicastAction              string              `yaml:"unknown_mac_unicast_action,omitempty" json:"unknownMacUnicastAction,omitempty"`
 	EnableHppDirect                      string              `yaml:"enable_hpp_direct,omitempty" json:"enableHppDirect,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 {

diff --git a/types/zz_generated_deepcopy.go b/types/zz_generated_deepcopy.go