Merge pull request #3626 from noironetworks/aci-6042-rke-1.6.0

[release/v1.6] Add ACI-CNI 6.0.4.2 variables
rancher · Jul 9, 2024 · 02e15d2 · 02e15d2
2 parents 3d958e0 + a82ac1d
commit 02e15d2
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 44 deletions.
diff --git a/cluster/defaults.go b/cluster/defaults.go
@@ -139,6 +139,11 @@ const (
 	DefaultAciApicConnectionRetryLimit               = "5"
 	DefaultAciTaintNotReadyNode                      = "false"
 	DefaultAciDropLogDisableEvents                   = "false"
+	DefaultAciOpflexStartupEnabled                   = "false"
+	DefaultAciOpflexStartupPolicyDuration            = "60"
+	DefaultAciOpflexStartupResolveAftConn            = "false"
+	DefaultAciOpflexSwitchSyncDelay                  = "5"
+	DefaultAciOpflexSwitchSyncDynamic                = "10"
 	KubeAPIArgAdmissionControlConfigFile             = "admission-control-config-file"
 	DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
 
@@ -838,6 +843,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
 			AciUseSystemNodePriorityClass:        DefaultAciUseSystemNodePriorityClass,
 			AciContainersMemoryRequest:           DefaultAciAciContainersMemoryRequest,
 			AciContainersMemoryLimit:             DefaultAciAciContainersMemoryLimit,
+			AciOpflexStartupEnabled:              DefaultAciOpflexStartupEnabled,
+			AciOpflexStartupPolicyDuration:       DefaultAciOpflexStartupPolicyDuration,
+			AciOpflexStartupResolveAftConn:       DefaultAciOpflexStartupResolveAftConn,
+			AciOpflexSwitchSyncDelay:             DefaultAciOpflexSwitchSyncDelay,
+			AciOpflexSwitchSyncDynamic:           DefaultAciOpflexSwitchSyncDynamic,
 		}
 	}
 	if c.Network.CalicoNetworkProvider != nil {
@@ -919,6 +929,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode)
 		setDefaultIfEmpty(&c.Network.AciNetworkProvider.DropLogDisableEvents, DefaultAciDropLogDisableEvents)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupEnabled, DefaultAciOpflexStartupEnabled)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupPolicyDuration, DefaultAciOpflexStartupPolicyDuration)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexStartupResolveAftConn, DefaultAciOpflexStartupResolveAftConn)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexSwitchSyncDelay, DefaultAciOpflexSwitchSyncDelay)
+		setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexSwitchSyncDynamic, DefaultAciOpflexSwitchSyncDynamic)
 		networkPluginConfigDefaultsMap[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit
 		networkPluginConfigDefaultsMap[AciOVSMemoryRequest] = c.Network.AciNetworkProvider.OVSMemoryRequest
 		networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy
@@ -1025,6 +1040,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
 		networkPluginConfigDefaultsMap[AciApicConnectionRetryLimit] = c.Network.AciNetworkProvider.ApicConnectionRetryLimit
 		networkPluginConfigDefaultsMap[AciTaintNotReadyNode] = c.Network.AciNetworkProvider.TaintNotReadyNode
 		networkPluginConfigDefaultsMap[AciDropLogDisableEvents] = c.Network.AciNetworkProvider.DropLogDisableEvents
+		networkPluginConfigDefaultsMap[AciOpflexStartupEnabled] = c.Network.AciNetworkProvider.OpflexStartupEnabled
+		networkPluginConfigDefaultsMap[AciOpflexStartupPolicyDuration] = c.Network.AciNetworkProvider.OpflexStartupPolicyDuration
+		networkPluginConfigDefaultsMap[AciOpflexStartupResolveAftConn] = c.Network.AciNetworkProvider.OpflexStartupResolveAftConn
+		networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDelay] = c.Network.AciNetworkProvider.OpflexSwitchSyncDelay
+		networkPluginConfigDefaultsMap[AciOpflexSwitchSyncDynamic] = c.Network.AciNetworkProvider.OpflexSwitchSyncDynamic
 	}
 	for k, v := range networkPluginConfigDefaultsMap {
 		setDefaultIfEmptyMapValue(c.Network.Options, k, v)

diff --git a/cluster/network.go b/cluster/network.go
@@ -181,6 +181,11 @@ const (
 	AciApicConnectionRetryLimit             = "aci_apic_connection_retry_limit"
 	AciTaintNotReadyNode                    = "aci_taint_not_ready_node"
 	AciDropLogDisableEvents                 = "aci_drop_log_disable_events"
+	AciOpflexStartupEnabled                 = "aci_opflex_startup_enabled"
+	AciOpflexStartupPolicyDuration          = "aci_opflex_startup_policy_duration"
+	AciOpflexStartupResolveAftConn          = "aci_opflex_startup_resolve_aft_conn"
+	AciOpflexSwitchSyncDelay                = "aci_opflex_switch_sync_delay"
+	AciOpflexSwitchSyncDynamic              = "aci_opflex_switch_sync_dynamic"
 	// List of map keys to be used with network templates
 
 	// EtcdEndpoints is the server address for Etcd, used by calico
@@ -356,6 +361,11 @@ const (
 	ApicConnectionRetryLimit               = "ApicConnectionRetryLimit"
 	TaintNotReadyNode                      = "TaintNotReadyNode"
 	DropLogDisableEvents                   = "DropLogDisableEvents"
+	OpflexStartupEnabled                   = "OpflexStartupEnabled"
+	OpflexStartupPolicyDuration            = "OpflexStartupPolicyDuration"
+	OpflexStartupResolveAftConn            = "OpflexStartupResolveAftConn"
+	OpflexSwitchSyncDelay                  = "OpflexSwitchSyncDelay"
+	OpflexSwitchSyncDynamic                = "OpflexSwitchSyncDynamic"
 )
 
 type IPPool struct {
@@ -725,6 +735,11 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
 		TaintNotReadyNode:                    c.Network.Options[AciTaintNotReadyNode],
 		DropLogDisableEvents:                 c.Network.Options[AciDropLogDisableEvents],
 		NodeSnatRedirectExclude:              c.Network.AciNetworkProvider.NodeSnatRedirectExclude,
+		OpflexStartupEnabled:                 c.Network.Options[AciOpflexStartupEnabled],
+		OpflexStartupPolicyDuration:          c.Network.Options[AciOpflexStartupPolicyDuration],
+		OpflexStartupResolveAftConn:          c.Network.Options[AciOpflexStartupResolveAftConn],
+		OpflexSwitchSyncDelay:                c.Network.Options[AciOpflexSwitchSyncDelay],
+		OpflexSwitchSyncDynamic:              c.Network.Options[AciOpflexSwitchSyncDynamic],
 		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
@@ -699,6 +699,11 @@ type AciNetworkProvider struct {
 	ApicConnectionRetryLimit             string              `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"`
 	TaintNotReadyNode                    string              `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,omitempty"`
 	DropLogDisableEvents                 string              `yaml:"drop_log_disable_events,omitempty" json:"dropLogDisableEvents,omitempty"`
+	OpflexStartupEnabled                 string              `yaml:"opflex_startup_enabled,omitempty" json:"opflexStartupEnabled,omitempty"`
+	OpflexStartupPolicyDuration          string              `yaml:"opflex_startup_policy_duration,omitempty" json:"opflexStartupPolicyDuration,omitempty"`
+	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"`
 }
 
 type KubernetesServicesOptions struct {