rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 21:24:00 +00:00
Code Issues Releases Wiki Activity

add ACI CNI 6043 variables

Browse Source
This commit is contained in:
Akhilesh Sarda
2024-09-08 17:45:13 -04:00
committed by Kinara Shah
parent 231079b44e
commit 3649836054
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/defaults.go
View File

@@ -878,6 +878,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicRefreshTime, DefaultAciApicRefreshTime) setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicRefreshTime, DefaultAciApicRefreshTime)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ServiceMonitorInterval, DefaultAciServiceMonitorInterval) setDefaultIfEmpty(&c.Network.AciNetworkProvider.ServiceMonitorInterval, DefaultAciServiceMonitorInterval)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.NoPriorityClass, DefaultAciNoPriorityClass) setDefaultIfEmpty(&c.Network.AciNetworkProvider.NoPriorityClass, DefaultAciNoPriorityClass)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseAciCniPriorityClass, DefaultAciUseAciCniPriorityClass)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.MaxNodesSvcGraph, DefaultAciMaxNodesSvcGraph) setDefaultIfEmpty(&c.Network.AciNetworkProvider.MaxNodesSvcGraph, DefaultAciMaxNodesSvcGraph)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.SnatContractScope, DefaultAciSnatContractScope) setDefaultIfEmpty(&c.Network.AciNetworkProvider.SnatContractScope, DefaultAciSnatContractScope)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.PodSubnetChunkSize, DefaultAciPodSubnetChunkSize) setDefaultIfEmpty(&c.Network.AciNetworkProvider.PodSubnetChunkSize, DefaultAciPodSubnetChunkSize)
@@ -947,6 +948,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciApicRefreshTime] = c.Network.AciNetworkProvider.ApicRefreshTime networkPluginConfigDefaultsMap[AciApicRefreshTime] = c.Network.AciNetworkProvider.ApicRefreshTime
networkPluginConfigDefaultsMap[AciServiceMonitorInterval] = c.Network.AciNetworkProvider.ServiceMonitorInterval networkPluginConfigDefaultsMap[AciServiceMonitorInterval] = c.Network.AciNetworkProvider.ServiceMonitorInterval
networkPluginConfigDefaultsMap[AciNoPriorityClass] = c.Network.AciNetworkProvider.NoPriorityClass networkPluginConfigDefaultsMap[AciNoPriorityClass] = c.Network.AciNetworkProvider.NoPriorityClass
networkPluginConfigDefaultsMap[AciUseAciCniPriorityClass] = c.Network.AciNetworkProvider.UseAciCniPriorityClass
networkPluginConfigDefaultsMap[AciMaxNodesSvcGraph] = c.Network.AciNetworkProvider.MaxNodesSvcGraph networkPluginConfigDefaultsMap[AciMaxNodesSvcGraph] = c.Network.AciNetworkProvider.MaxNodesSvcGraph
networkPluginConfigDefaultsMap[AciSnatContractScope] = c.Network.AciNetworkProvider.SnatContractScope networkPluginConfigDefaultsMap[AciSnatContractScope] = c.Network.AciNetworkProvider.SnatContractScope
networkPluginConfigDefaultsMap[AciPodSubnetChunkSize] = c.Network.AciNetworkProvider.PodSubnetChunkSize networkPluginConfigDefaultsMap[AciPodSubnetChunkSize] = c.Network.AciNetworkProvider.PodSubnetChunkSize
@@ -1045,6 +1047,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciOpflexStartupResolveAftConn] = c.Network.AciNetworkProvider.OpflexStartupResolveAftConn networkPluginConfigDefaultsMap[AciOpflexStartupResolveAftConn] = c.Network.AciNetworkProvider.OpflexStartupResolveAftConn
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
} }
for k, v := range networkPluginConfigDefaultsMap { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

3
cluster/network.go
View File

@@ -186,6 +186,7 @@ const (
AciOpflexStartupResolveAftConn = "aci_opflex_startup_resolve_aft_conn" AciOpflexStartupResolveAftConn = "aci_opflex_startup_resolve_aft_conn"
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"
// 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
@@ -366,6 +367,7 @@ const (
OpflexStartupResolveAftConn = "OpflexStartupResolveAftConn" OpflexStartupResolveAftConn = "OpflexStartupResolveAftConn"
OpflexSwitchSyncDelay = "OpflexSwitchSyncDelay" OpflexSwitchSyncDelay = "OpflexSwitchSyncDelay"
OpflexSwitchSyncDynamic = "OpflexSwitchSyncDynamic" OpflexSwitchSyncDynamic = "OpflexSwitchSyncDynamic"
UnknownMacUnicastAction = "UnknownMacUnicastAction"
) )
type IPPool struct { type IPPool struct {
@@ -740,6 +742,7 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
OpflexStartupResolveAftConn: c.Network.Options[AciOpflexStartupResolveAftConn], OpflexStartupResolveAftConn: c.Network.Options[AciOpflexStartupResolveAftConn],
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],
AciCniDeployContainer: c.SystemImages.AciCniDeployContainer, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,
AciOpflexContainer: c.SystemImages.AciOpflexContainer, AciOpflexContainer: c.SystemImages.AciOpflexContainer,

1
types/rke_types.go
View File

@@ -708,6 +708,7 @@ type AciNetworkProvider struct {
OpflexStartupResolveAftConn string `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"` OpflexStartupResolveAftConn string `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"`
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"`
} }
type KubernetesServicesOptions struct { type KubernetesServicesOptions struct {