From c25bb210da2cb788e2fc524558917edaf06a5b3b Mon Sep 17 00:00:00 2001 From: JeffinKottaram Date: Wed, 7 May 2025 11:51:23 -0700 Subject: [PATCH] Add ACI-CNI 6.1.1.4 variables --- cluster/defaults.go | 12 ++++++++++++ cluster/network.go | 12 ++++++++++++ types/rke_types.go | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/cluster/defaults.go b/cluster/defaults.go index 40b65806..837f49eb 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -146,6 +146,10 @@ const ( DefaultAciOpflexSwitchSyncDynamic = "10" DefaultAciEnableHppDirect = "false" DefaultAciProactiveConf = "false" + DefaultAciEpgResolvePrioritize = "true" + DefaultAciForceEpUndeclares = "true" + DefaultAciEnableApicRequestRetryDelay = "true" + DefaultAciApicRequestRetryDelay = "2" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" @@ -939,6 +943,10 @@ func (c *Cluster) setClusterNetworkDefaults() { setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode) setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect) setDefaultIfEmpty(&c.Network.AciNetworkProvider.ProactiveConf, DefaultAciProactiveConf) + setDefaultIfEmpty(&c.Network.AciNetworkProvider.EpgResolvePrioritize, DefaultAciEpgResolvePrioritize) + setDefaultIfEmpty(&c.Network.AciNetworkProvider.ForceEpUndeclares, DefaultAciForceEpUndeclares) + setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableApicRequestRetryDelay, DefaultAciEnableApicRequestRetryDelay) + setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicRequestRetryDelay, DefaultAciApicRequestRetryDelay) setDefaultIfEmpty(&c.Network.AciNetworkProvider.DropLogDisableEvents, DefaultAciDropLogDisableEvents) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration) @@ -1062,6 +1070,10 @@ func (c *Cluster) setClusterNetworkDefaults() { networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs networkPluginConfigDefaultsMap[AciProactiveConf] = c.Network.AciNetworkProvider.ProactiveConf + networkPluginConfigDefaultsMap[AciEpgResolvePrioritize] = c.Network.AciNetworkProvider.EpgResolvePrioritize + networkPluginConfigDefaultsMap[AciForceEpUndeclares] = c.Network.AciNetworkProvider.ForceEpUndeclares + networkPluginConfigDefaultsMap[AciEnableApicRequestRetryDelay] = c.Network.AciNetworkProvider.EnableApicRequestRetryDelay + networkPluginConfigDefaultsMap[AciApicRequestRetryDelay] = c.Network.AciNetworkProvider.ApicRequestRetryDelay } for k, v := range networkPluginConfigDefaultsMap { setDefaultIfEmptyMapValue(c.Network.Options, k, v) diff --git a/cluster/network.go b/cluster/network.go index dfd48359..927988c9 100644 --- a/cluster/network.go +++ b/cluster/network.go @@ -191,6 +191,10 @@ const ( AciEnableHppDirect = "aci_enable_hpp_direct" AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_delay" AciProactiveConf = "aci_proactive_conf" + AciEpgResolvePrioritize = "aci_epg_resolve_prioritize" + AciForceEpUndeclares = "aci_force_ep_undeclares" + AciEnableApicRequestRetryDelay = "aci_enable_apic_request_retry_delay" + AciApicRequestRetryDelay = "aci_apic_request_retry_delay" // List of map keys to be used with network templates // EtcdEndpoints is the server address for Etcd, used by calico @@ -376,6 +380,10 @@ const ( EnableHppDirect = "EnableHppDirect" OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay" ProactiveConf = "ProactiveConf" + EpgResolvePrioritize = "EpgResolvePrioritize" + ForceEpUndeclares = "ForceEpUndeclares" + EnableApicRequestRetryDelay = "EnableApicRequestRetryDelay" + ApicRequestRetryDelay = "ApicRequestRetryDelay" ) type IPPool struct { @@ -755,6 +763,10 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{}) EnableHppDirect: c.Network.Options[AciEnableHppDirect], OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay], ProactiveConf: c.Network.Options[AciProactiveConf], + EpgResolvePrioritize: c.Network.Options[AciEpgResolvePrioritize], + ForceEpUndeclares: c.Network.Options[AciForceEpUndeclares], + EnableApicRequestRetryDelay: c.Network.Options[AciEnableApicRequestRetryDelay], + ApicRequestRetryDelay: c.Network.Options[AciApicRequestRetryDelay], 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 7ee6152d..e36ad160 100644 --- a/types/rke_types.go +++ b/types/rke_types.go @@ -715,6 +715,10 @@ type AciNetworkProvider struct { 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"` + EpgResolvePrioritize string `yaml:"epg_resolve_prioritize,omitempty" json:"epgResolvePrioritize,omitempty"` + ForceEpUndeclares string `yaml:"force_ep_undeclares,omitempty" json:"forceEpUndeclares,omitempty"` + EnableApicRequestRetryDelay string `yaml:"enable_apic_request_retry_delay,omitempty" json:"enableApicRequestRetryDelay,omitempty"` + ApicRequestRetryDelay string `yaml:"apic_request_retry_delay,omitempty" json:"apicRequestRetryDelay,omitempty"` } type KubernetesServicesOptions struct {