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

Add ACI CNI 6041 variables

Browse Source
This commit is contained in:
JeffinKottaram 2024-02-29 07:57:24 -08:00
parent 20422b5ae7
commit 077d5c93c8
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/defaults.go
View File

@ -137,6 +137,10 @@ const (
DefaultAciEnableOpflexAgentReconnect = "false" DefaultAciEnableOpflexAgentReconnect = "false"
DefaultAciOpflexOpensslCompat = "false" DefaultAciOpflexOpensslCompat = "false"
DefaultAciTolerationSeconds = "600" DefaultAciTolerationSeconds = "600"
DefaultAciDisableHppRendering = "false"
DefaultAciApicConnectionRetryLimit = "5"
DefaultAciTaintNotReadyNode = "false"
DefaultAciDropLogDisableEvents = "false"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@ -917,6 +921,10 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableOpflexAgentReconnect, DefaultAciEnableOpflexAgentReconnect) setDefaultIfEmpty(&c.Network.AciNetworkProvider.EnableOpflexAgentReconnect, DefaultAciEnableOpflexAgentReconnect)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexOpensslCompat, DefaultAciOpflexOpensslCompat) setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexOpensslCompat, DefaultAciOpflexOpensslCompat)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.TolerationSeconds, DefaultAciTolerationSeconds) setDefaultIfEmpty(&c.Network.AciNetworkProvider.TolerationSeconds, DefaultAciTolerationSeconds)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableHppRendering, DefaultAciDisableHppRendering)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ApicConnectionRetryLimit, DefaultAciApicConnectionRetryLimit)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.TaintNotReadyNode, DefaultAciTaintNotReadyNode)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DropLogDisableEvents, DefaultAciDropLogDisableEvents)
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
@ -1019,6 +1027,10 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciEnableOpflexAgentReconnect] = c.Network.AciNetworkProvider.EnableOpflexAgentReconnect networkPluginConfigDefaultsMap[AciEnableOpflexAgentReconnect] = c.Network.AciNetworkProvider.EnableOpflexAgentReconnect
networkPluginConfigDefaultsMap[AciOpflexOpensslCompat] = c.Network.AciNetworkProvider.OpflexOpensslCompat networkPluginConfigDefaultsMap[AciOpflexOpensslCompat] = c.Network.AciNetworkProvider.OpflexOpensslCompat
networkPluginConfigDefaultsMap[AciTolerationSeconds] = c.Network.AciNetworkProvider.TolerationSeconds networkPluginConfigDefaultsMap[AciTolerationSeconds] = c.Network.AciNetworkProvider.TolerationSeconds
networkPluginConfigDefaultsMap[AciDisableHppRendering] = c.Network.AciNetworkProvider.DisableHppRendering
networkPluginConfigDefaultsMap[AciApicConnectionRetryLimit] = c.Network.AciNetworkProvider.ApicConnectionRetryLimit
networkPluginConfigDefaultsMap[AciTaintNotReadyNode] = c.Network.AciNetworkProvider.TaintNotReadyNode
networkPluginConfigDefaultsMap[AciDropLogDisableEvents] = c.Network.AciNetworkProvider.DropLogDisableEvents
} }
for k, v := range networkPluginConfigDefaultsMap { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)

12
cluster/network.go
View File

@ -177,6 +177,10 @@ const (
AciEnableOpflexAgentReconnect = "aci_enable_opflex_agent_reconnect" AciEnableOpflexAgentReconnect = "aci_enable_opflex_agent_reconnect"
AciOpflexOpensslCompat = "aci_opflex_openssl_compat" AciOpflexOpensslCompat = "aci_opflex_openssl_compat"
AciTolerationSeconds = "aci_toleration_seconds" AciTolerationSeconds = "aci_toleration_seconds"
AciDisableHppRendering = "aci_disable_hpp_rendering"
AciApicConnectionRetryLimit = "aci_apic_connection_retry_limit"
AciTaintNotReadyNode = "aci_taint_not_ready_node"
AciDropLogDisableEvents = "aci_drop_log_disable_events"
// 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
@ -348,6 +352,10 @@ const (
OpflexOpensslCompat = "OpflexOpensslCompat" OpflexOpensslCompat = "OpflexOpensslCompat"
NodeSnatRedirectExclude = "NodeSnatRedirectExclude" NodeSnatRedirectExclude = "NodeSnatRedirectExclude"
TolerationSeconds = "TolerationSeconds" TolerationSeconds = "TolerationSeconds"
DisableHppRendering = "DisableHppRendering"
ApicConnectionRetryLimit = "ApicConnectionRetryLimit"
TaintNotReadyNode = "TaintNotReadyNode"
DropLogDisableEvents = "DropLogDisableEvents"
) )
type IPPool struct { type IPPool struct {
@ -712,6 +720,10 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
EnableOpflexAgentReconnect: c.Network.Options[AciEnableOpflexAgentReconnect], EnableOpflexAgentReconnect: c.Network.Options[AciEnableOpflexAgentReconnect],
OpflexOpensslCompat: c.Network.Options[AciOpflexOpensslCompat], OpflexOpensslCompat: c.Network.Options[AciOpflexOpensslCompat],
TolerationSeconds: c.Network.Options[AciTolerationSeconds], TolerationSeconds: c.Network.Options[AciTolerationSeconds],
DisableHppRendering: c.Network.Options[AciDisableHppRendering],
ApicConnectionRetryLimit: c.Network.Options[AciApicConnectionRetryLimit],
TaintNotReadyNode: c.Network.Options[AciTaintNotReadyNode],
DropLogDisableEvents: c.Network.Options[AciDropLogDisableEvents],
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,

4
types/rke_types.go
View File

@ -698,6 +698,10 @@ type AciNetworkProvider struct {
OpflexOpensslCompat string `yaml:"opflex_openssl_compat,omitempty" json:"opflexOpensslCompat,omitempty"` OpflexOpensslCompat string `yaml:"opflex_openssl_compat,omitempty" json:"opflexOpensslCompat,omitempty"`
NodeSnatRedirectExclude []map[string]string `yaml:"node_snat_redirect_exclude,omitempty" json:"nodeSnatRedirectExclude,omitempty"` NodeSnatRedirectExclude []map[string]string `yaml:"node_snat_redirect_exclude,omitempty" json:"nodeSnatRedirectExclude,omitempty"`
TolerationSeconds string `yaml:"toleration_seconds,omitempty" json:"tolerationSeconds,omitempty"` TolerationSeconds string `yaml:"toleration_seconds,omitempty" json:"tolerationSeconds,omitempty"`
DisableHppRendering string `yaml:"disable_hpp_rendering,omitempty" json:"disableHppRendering,omitempty"`
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"`
} }
type KubernetesServicesOptions struct { type KubernetesServicesOptions struct {