rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-27 10:58:32 +00:00
Code Issues Releases Wiki Activity

Add ACI-CNI 6.1.1.4 variables

Browse Source
This commit is contained in:
JeffinKottaram 2025-05-07 11:51:23 -07:00
parent 07129d73a7
commit c25bb210da
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/defaults.go
View File

@ -146,6 +146,10 @@ const (
DefaultAciOpflexSwitchSyncDynamic = "10" DefaultAciOpflexSwitchSyncDynamic = "10"
DefaultAciEnableHppDirect = "false" DefaultAciEnableHppDirect = "false"
DefaultAciProactiveConf = "false" DefaultAciProactiveConf = "false"
DefaultAciEpgResolvePrioritize = "true"
DefaultAciForceEpUndeclares = "true"
DefaultAciEnableApicRequestRetryDelay = "true"
DefaultAciApicRequestRetryDelay = "2"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@ -939,6 +943,10 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode) setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect) setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ProactiveConf, DefaultAciProactiveConf) 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.DropLogDisableEvents, DefaultAciDropLogDisableEvents)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration)
@ -1062,6 +1070,10 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay
networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs networkPluginConfigDefaultsMap[AciDropLogOpflexRedirectDropLogs] = c.Network.AciNetworkProvider.DropLogOpflexRedirectDropLogs
networkPluginConfigDefaultsMap[AciProactiveConf] = c.Network.AciNetworkProvider.ProactiveConf 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 { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

12
cluster/network.go
View File

@ -191,6 +191,10 @@ const (
AciEnableHppDirect = "aci_enable_hpp_direct" AciEnableHppDirect = "aci_enable_hpp_direct"
AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_delay" AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_delay"
AciProactiveConf = "aci_proactive_conf" 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 // List of map keys to be used with network templates
// EtcdEndpoints is the server address for Etcd, used by calico // EtcdEndpoints is the server address for Etcd, used by calico
@ -376,6 +380,10 @@ const (
EnableHppDirect = "EnableHppDirect" EnableHppDirect = "EnableHppDirect"
OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay" OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay"
ProactiveConf = "ProactiveConf" ProactiveConf = "ProactiveConf"
EpgResolvePrioritize = "EpgResolvePrioritize"
ForceEpUndeclares = "ForceEpUndeclares"
EnableApicRequestRetryDelay = "EnableApicRequestRetryDelay"
ApicRequestRetryDelay = "ApicRequestRetryDelay"
) )
type IPPool struct { type IPPool struct {
@ -755,6 +763,10 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
EnableHppDirect: c.Network.Options[AciEnableHppDirect], EnableHppDirect: c.Network.Options[AciEnableHppDirect],
OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay], OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay],
ProactiveConf: c.Network.Options[AciProactiveConf], 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, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,
AciOpflexContainer: c.SystemImages.AciOpflexContainer, AciOpflexContainer: c.SystemImages.AciOpflexContainer,

4
types/rke_types.go
View File

@ -715,6 +715,10 @@ type AciNetworkProvider struct {
EnableHppDirect string `yaml:"enable_hpp_direct,omitempty" json:"enableHppDirect,omitempty"` EnableHppDirect string `yaml:"enable_hpp_direct,omitempty" json:"enableHppDirect,omitempty"`
OpflexAgentResetWaitDelay string `yaml:"opflex_agent_reset_wait_delay,omitempty" json:"opflexAgentResetWaitDelay,omitempty"` OpflexAgentResetWaitDelay string `yaml:"opflex_agent_reset_wait_delay,omitempty" json:"opflexAgentResetWaitDelay,omitempty"`
ProactiveConf string `yaml:"proactive_conf,omitempty" json:"proactiveConf,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 { type KubernetesServicesOptions struct {