rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-17 08:51:11 +00:00
Code Issues Releases Wiki Activity

Add ACI CNI 6042 variables

Browse Source
This commit is contained in:
Akhilesh Sarda 2024-06-25 15:02:05 -04:00 committed by JeffinKottaram
parent fae8f4e8f6
commit 15201f6ca1
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cluster/defaults.go
View File

@ -141,6 +141,11 @@ const (
DefaultAciApicConnectionRetryLimit = "5" DefaultAciApicConnectionRetryLimit = "5"
DefaultAciTaintNotReadyNode = "false" DefaultAciTaintNotReadyNode = "false"
DefaultAciDropLogDisableEvents = "false" DefaultAciDropLogDisableEvents = "false"
DefaultAciOpflexStartupEnabled = "false"
DefaultAciOpflexStartupPolicyDuration = "60"
DefaultAciOpflexStartupResolveAftConn = "false"
DefaultAciOpflexSwitchSyncDelay = "5"
DefaultAciOpflexSwitchSyncDynamic = "10"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@ -844,6 +849,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
AciUseSystemNodePriorityClass: DefaultAciUseSystemNodePriorityClass, AciUseSystemNodePriorityClass: DefaultAciUseSystemNodePriorityClass,
AciContainersMemoryRequest: DefaultAciAciContainersMemoryRequest, AciContainersMemoryRequest: DefaultAciAciContainersMemoryRequest,
AciContainersMemoryLimit: DefaultAciAciContainersMemoryLimit, AciContainersMemoryLimit: DefaultAciAciContainersMemoryLimit,
AciOpflexStartupEnabled: DefaultAciOpflexStartupEnabled,
AciOpflexStartupPolicyDuration: DefaultAciOpflexStartupPolicyDuration,
AciOpflexStartupResolveAftConn: DefaultAciOpflexStartupResolveAftConn,
AciOpflexSwitchSyncDelay: DefaultAciOpflexSwitchSyncDelay,
AciOpflexSwitchSyncDynamic: DefaultAciOpflexSwitchSyncDynamic,
} }
} }
if c.Network.CalicoNetworkProvider != nil { if c.Network.CalicoNetworkProvider != nil {
@ -925,6 +935,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
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.DropLogDisableEvents, DefaultAciDropLogDisableEvents) 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[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit
networkPluginConfigDefaultsMap[AciOVSMemoryRequest] = c.Network.AciNetworkProvider.OVSMemoryRequest networkPluginConfigDefaultsMap[AciOVSMemoryRequest] = c.Network.AciNetworkProvider.OVSMemoryRequest
networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy
@ -1031,6 +1046,11 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciApicConnectionRetryLimit] = c.Network.AciNetworkProvider.ApicConnectionRetryLimit networkPluginConfigDefaultsMap[AciApicConnectionRetryLimit] = c.Network.AciNetworkProvider.ApicConnectionRetryLimit
networkPluginConfigDefaultsMap[AciTaintNotReadyNode] = c.Network.AciNetworkProvider.TaintNotReadyNode networkPluginConfigDefaultsMap[AciTaintNotReadyNode] = c.Network.AciNetworkProvider.TaintNotReadyNode
networkPluginConfigDefaultsMap[AciDropLogDisableEvents] = c.Network.AciNetworkProvider.DropLogDisableEvents 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 { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

15
cluster/network.go
View File

@ -181,6 +181,11 @@ const (
AciApicConnectionRetryLimit = "aci_apic_connection_retry_limit" AciApicConnectionRetryLimit = "aci_apic_connection_retry_limit"
AciTaintNotReadyNode = "aci_taint_not_ready_node" AciTaintNotReadyNode = "aci_taint_not_ready_node"
AciDropLogDisableEvents = "aci_drop_log_disable_events" 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 // 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
@ -356,6 +361,11 @@ const (
ApicConnectionRetryLimit = "ApicConnectionRetryLimit" ApicConnectionRetryLimit = "ApicConnectionRetryLimit"
TaintNotReadyNode = "TaintNotReadyNode" TaintNotReadyNode = "TaintNotReadyNode"
DropLogDisableEvents = "DropLogDisableEvents" DropLogDisableEvents = "DropLogDisableEvents"
OpflexStartupEnabled = "OpflexStartupEnabled"
OpflexStartupPolicyDuration = "OpflexStartupPolicyDuration"
OpflexStartupResolveAftConn = "OpflexStartupResolveAftConn"
OpflexSwitchSyncDelay = "OpflexSwitchSyncDelay"
OpflexSwitchSyncDynamic = "OpflexSwitchSyncDynamic"
) )
type IPPool struct { type IPPool struct {
@ -724,6 +734,11 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
ApicConnectionRetryLimit: c.Network.Options[AciApicConnectionRetryLimit], ApicConnectionRetryLimit: c.Network.Options[AciApicConnectionRetryLimit],
TaintNotReadyNode: c.Network.Options[AciTaintNotReadyNode], TaintNotReadyNode: c.Network.Options[AciTaintNotReadyNode],
DropLogDisableEvents: c.Network.Options[AciDropLogDisableEvents], DropLogDisableEvents: c.Network.Options[AciDropLogDisableEvents],
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],
NodeSnatRedirectExclude: c.Network.AciNetworkProvider.NodeSnatRedirectExclude, NodeSnatRedirectExclude: c.Network.AciNetworkProvider.NodeSnatRedirectExclude,
AciCniDeployContainer: c.SystemImages.AciCniDeployContainer, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,

5
types/rke_types.go
View File

@ -702,6 +702,11 @@ type AciNetworkProvider struct {
ApicConnectionRetryLimit string `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"` ApicConnectionRetryLimit string `yaml:"apic_connection_retry_limit,omitempty" json:"apicConnectionRetryLimit,omitempty"`
TaintNotReadyNode string `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,omitempty"` TaintNotReadyNode string `yaml:"taint_not_ready_node,omitempty" json:"taintNotReadyNode,omitempty"`
DropLogDisableEvents string `yaml:"drop_log_disable_events,omitempty" json:"dropLogDisableEvents,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 { type KubernetesServicesOptions struct {