Merge pull request #3686 from kinarashah/cal

[v1.6] updates for august patches
rancher · Sep 10, 2024 · 8e85ccb · 8e85ccb
2 parents 231079b + 9c05f80
commit 8e85ccb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/cluster/defaults.go b/cluster/defaults.go
@@ -878,6 +878,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicRefreshTime, DefaultAciApicRefreshTime)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.ServiceMonitorInterval, DefaultAciServiceMonitorInterval)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.NoPriorityClass, DefaultAciNoPriorityClass)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseAciCniPriorityClass, DefaultAciUseAciCniPriorityClass)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.MaxNodesSvcGraph, DefaultAciMaxNodesSvcGraph)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.SnatContractScope, DefaultAciSnatContractScope)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.PodSubnetChunkSize, DefaultAciPodSubnetChunkSize)
@@ -947,6 +948,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		networkPluginConfigDefaultsMap[AciApicRefreshTime] = c.Network.AciNetworkProvider.ApicRefreshTime
 		networkPluginConfigDefaultsMap[AciServiceMonitorInterval] = c.Network.AciNetworkProvider.ServiceMonitorInterval
 		networkPluginConfigDefaultsMap[AciNoPriorityClass] = c.Network.AciNetworkProvider.NoPriorityClass
+		networkPluginConfigDefaultsMap[AciUseAciCniPriorityClass] = c.Network.AciNetworkProvider.UseAciCniPriorityClass
 		networkPluginConfigDefaultsMap[AciMaxNodesSvcGraph] = c.Network.AciNetworkProvider.MaxNodesSvcGraph
 		networkPluginConfigDefaultsMap[AciSnatContractScope] = c.Network.AciNetworkProvider.SnatContractScope
 		networkPluginConfigDefaultsMap[AciPodSubnetChunkSize] = c.Network.AciNetworkProvider.PodSubnetChunkSize
@@ -1045,6 +1047,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		networkPluginConfigDefaultsMap[AciOpflexStartupResolveAftConn] = c.Network.AciNetworkProvider.OpflexStartupResolveAftConn
 		networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDelay] = c.Network.AciNetworkProvider.OpflexSwitchSyncDelay
 		networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDynamic] = c.Network.AciNetworkProvider.OpflexSwitchSyncDynamic
+		networkPluginConfigDefaultsMap[AciUnknownMacUnicastAction] = c.Network.AciNetworkProvider.UnknownMacUnicastAction
 	}
 	for k, v := range networkPluginConfigDefaultsMap {
 		setDefaultIfEmptyMapValue(c.Network.Options, k, v)

diff --git a/cluster/network.go b/cluster/network.go
@@ -186,6 +186,7 @@ const (
 	AciOpflexStartupResolveAftConn          = "aci_opflex_startup_resolve_aft_conn"
 	AciOpflexSwitchSyncDelay                = "aci_opflex_switch_sync_delay"
 	AciOpflexSwitchSyncDynamic              = "aci_opflex_switch_sync_dynamic"
+	AciUnknownMacUnicastAction              = "aci_unknown_mac_unicast_action"
 	// List of map keys to be used with network templates
 
 	// EtcdEndpoints is the server address for Etcd, used by calico
@@ -366,6 +367,7 @@ const (
 	OpflexStartupResolveAftConn            = "OpflexStartupResolveAftConn"
 	OpflexSwitchSyncDelay                  = "OpflexSwitchSyncDelay"
 	OpflexSwitchSyncDynamic                = "OpflexSwitchSyncDynamic"
+	UnknownMacUnicastAction                = "UnknownMacUnicastAction"
 )
 
 type IPPool struct {
@@ -740,6 +742,7 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
 		OpflexStartupResolveAftConn:          c.Network.Options[AciOpflexStartupResolveAftConn],
 		OpflexSwitchSyncDelay:                c.Network.Options[AciOpflexSwitchSyncDelay],
 		OpflexSwitchSyncDynamic:              c.Network.Options[AciOpflexSwitchSyncDynamic],
+		UnknownMacUnicastAction:              c.Network.Options[AciUnknownMacUnicastAction],
 		AciCniDeployContainer:                c.SystemImages.AciCniDeployContainer,
 		AciHostContainer:                     c.SystemImages.AciHostContainer,
 		AciOpflexContainer:                   c.SystemImages.AciOpflexContainer,

diff --git a/data/bindata.go b/data/bindata.go
diff --git a/data/data.json b/data/data.json
diff --git a/types/rke_types.go b/types/rke_types.go
@@ -708,6 +708,7 @@ type AciNetworkProvider struct {
 	OpflexStartupResolveAftConn          string              `yaml:"opflex_startup_resolve_aft_conn,omitempty" json:"opflexStartupResolveAftConn,omitempty"`
 	OpflexSwitchSyncDelay                string              `yaml:"opflex_switch_sync_delay,omitempty" json:"opflexSwitchSyncDelay,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 {