diff --git a/cluster/defaults.go b/cluster/defaults.go index 4516139d..4e1f159e 100644 --- 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 index b382e9ce..dfd48359 100644 --- 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/types/rke_types.go b/types/rke_types.go index a032a5fe..3b54464c 100644 --- 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 {