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

Add ACI-CNI 6.1.1.1 variables

Browse Source
This commit is contained in:
Akhilesh Sarda 2024-10-01 04:07:30 -04:00 committed by JeffinKottaram
parent e65982776d
commit ed5e606be6
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/defaults.go
View File

@ -144,6 +144,7 @@ const (
DefaultAciOpflexStartupResolveAftConn = "false" DefaultAciOpflexStartupResolveAftConn = "false"
DefaultAciOpflexSwitchSyncDelay = "5" DefaultAciOpflexSwitchSyncDelay = "5"
DefaultAciOpflexSwitchSyncDynamic = "10" DefaultAciOpflexSwitchSyncDynamic = "10"
DefaultAciEnableHppDirect = "false"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@ -929,6 +930,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableHppRendering, DefaultAciDisableHppRendering) setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableHppRendering, DefaultAciDisableHppRendering)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit) setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode) setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableHppDirect, DefaultAciEnableHppDirect)
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)
@ -1048,6 +1050,8 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDelay] = c.Network.AciNetworkProvider.OpflexSwitchSyncDelay networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDelay] = c.Network.AciNetworkProvider.OpflexSwitchSyncDelay
networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDynamic] = c.Network.AciNetworkProvider.OpflexSwitchSyncDynamic networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDynamic] = c.Network.AciNetworkProvider.OpflexSwitchSyncDynamic
networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction
networkPluginConfigDefaultsMap[AciEnableHppDirect] = c.Network.AciNetworkProvider.EnableHppDirect
networkPluginConfigDefaultsMap[AciOpflexAgentResetWaitDelay] = c.Network.AciNetworkProvider.OpflexAgentResetWaitDelay
} }
for k, v := range networkPluginConfigDefaultsMap { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

6
cluster/network.go
View File

@ -187,6 +187,8 @@ const (
AciOpflexSwitchSyncDelay = "aci_opflex_switch_sync_delay" AciOpflexSwitchSyncDelay = "aci_opflex_switch_sync_delay"
AciOpflexSwitchSyncDynamic = "aci_opflex_switch_sync_dynamic" AciOpflexSwitchSyncDynamic = "aci_opflex_switch_sync_dynamic"
AciUnknownMacUnicastAction = "aci_unknown_mac_unicast_action" AciUnknownMacUnicastAction = "aci_unknown_mac_unicast_action"
AciEnableHppDirect = "aci_enable_hpp_direct"
AciOpflexAgentResetWaitDelay = "aci_opflex_agent_reset_wait_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
@ -368,6 +370,8 @@ const (
OpflexSwitchSyncDelay = "OpflexSwitchSyncDelay" OpflexSwitchSyncDelay = "OpflexSwitchSyncDelay"
OpflexSwitchSyncDynamic = "OpflexSwitchSyncDynamic" OpflexSwitchSyncDynamic = "OpflexSwitchSyncDynamic"
UnknownMacUnicastAction = "UnknownMacUnicastAction" UnknownMacUnicastAction = "UnknownMacUnicastAction"
EnableHppDirect = "EnableHppDirect"
OpflexAgentResetWaitDelay = "OpflexAgentResetWaitDelay"
) )
type IPPool struct { type IPPool struct {
@ -743,6 +747,8 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
OpflexSwitchSyncDelay: c.Network.Options[AciOpflexSwitchSyncDelay], OpflexSwitchSyncDelay: c.Network.Options[AciOpflexSwitchSyncDelay],
OpflexSwitchSyncDynamic: c.Network.Options[AciOpflexSwitchSyncDynamic], OpflexSwitchSyncDynamic: c.Network.Options[AciOpflexSwitchSyncDynamic],
UnknownMacUnicastAction: c.Network.Options[AciUnknownMacUnicastAction], UnknownMacUnicastAction: c.Network.Options[AciUnknownMacUnicastAction],
EnableHppDirect: c.Network.Options[AciEnableHppDirect],
OpflexAgentResetWaitDelay: c.Network.Options[AciOpflexAgentResetWaitDelay],
AciCniDeployContainer: c.SystemImages.AciCniDeployContainer, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,
AciOpflexContainer: c.SystemImages.AciOpflexContainer, AciOpflexContainer: c.SystemImages.AciOpflexContainer,

2
types/rke_types.go
View File

@ -709,6 +709,8 @@ type AciNetworkProvider struct {
OpflexSwitchSyncDelay string `yaml:"opflex_switch_sync_delay,omitempty" json:"opflexSwitchSyncDelay,omitempty"` OpflexSwitchSyncDelay string `yaml:"opflex_switch_sync_delay,omitempty" json:"opflexSwitchSyncDelay,omitempty"`
OpflexSwitchSyncDynamic string `yaml:"opflex_switch_sync_dynamic,omitempty" json:"opflexSwitchSyncDynamic,omitempty"` OpflexSwitchSyncDynamic string `yaml:"opflex_switch_sync_dynamic,omitempty" json:"opflexSwitchSyncDynamic,omitempty"`
UnknownMacUnicastAction string `yaml:"unknown_mac_unicast_action,omitempty" json:"unknownMacUnicastAction,omitempty"` 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"`
} }
type KubernetesServicesOptions struct { type KubernetesServicesOptions struct {