mirror of
https://github.com/rancher/rke.git
synced 2025-09-05 08:50:13 +00:00
Added ACI 6.0.3.1 variables
This commit is contained in:
committed by
Akhilesh Sarda
parent
3513dca251
commit
a996b3912a
@@ -72,59 +72,63 @@ const (
|
||||
|
||||
DefaultCanalFlexVolPluginDirectory = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/nodeagent~uds"
|
||||
|
||||
DefaultAciApicRefreshTime = "1200"
|
||||
DefaultAciOVSMemoryLimit = "1Gi"
|
||||
DefaultAciImagePullPolicy = "Always"
|
||||
DefaultAciServiceMonitorInterval = "5"
|
||||
DefaultAciPBRTrackingNonSnat = "false"
|
||||
DefaultAciInstallIstio = "false"
|
||||
DefaultAciIstioProfile = "demo"
|
||||
DefaultAciDropLogEnable = "true"
|
||||
DefaultAciControllerLogLevel = "info"
|
||||
DefaultAciHostAgentLogLevel = "info"
|
||||
DefaultAciOpflexAgentLogLevel = "info"
|
||||
DefaultAciUseAciCniPriorityClass = "false"
|
||||
DefaultAciNoPriorityClass = "false"
|
||||
DefaultAciMaxNodesSvcGraph = "32"
|
||||
DefaultAciSnatContractScope = "global"
|
||||
DefaultAciSnatNamespace = "aci-containers-system"
|
||||
DefaultAciCApic = "false"
|
||||
DefaultAciPodSubnetChunkSize = "32"
|
||||
DefaultAciSnatPortRangeStart = "5000"
|
||||
DefaultAciSnatPortRangeEnd = "65000"
|
||||
DefaultAciSnatPortsPerNode = "3000"
|
||||
DefaultAciUseHostNetnsVolume = "false"
|
||||
DefaultAciRunGbpContainer = "false"
|
||||
DefaultAciRunOpflexServerContainer = "false"
|
||||
DefaultAciUseAciAnywhereCRD = "false"
|
||||
DefaultAciEnableEndpointSlice = "false"
|
||||
DefaultAciOpflexClientSSL = "true"
|
||||
DefaultAciUsePrivilegedContainer = "false"
|
||||
DefaultAciUseOpflexServerVolume = "false"
|
||||
DefaultAciDurationWaitForNetwork = "210"
|
||||
DefaultAciUseClusterRole = "true"
|
||||
DefaultAciDisableWaitForNetwork = "false"
|
||||
DefaultAciApicSubscriptionDelay = "0"
|
||||
DefaultAciApicRefreshTickerAdjust = "0"
|
||||
DefaultAciDisablePeriodicSnatGlobalInfoSync = "false"
|
||||
DefaultAciOpflexDeviceDeleteTimeout = "0"
|
||||
DefaultAciMTUHeadRoom = "0"
|
||||
DefaultAciNodePodIfEnable = "false"
|
||||
DefaultAciSriovEnable = "false"
|
||||
DefaultAciMultusDisable = "true"
|
||||
DefaultAciNoWaitForServiceEpReadiness = "false"
|
||||
DefaultAciAddExternalSubnetsToRdconfig = "false"
|
||||
DefaultAciServiceGraphEndpointAddDelay = "0"
|
||||
DefaultAciHppOptimization = "false"
|
||||
DefaultAciSleepTimeSnatGlobalInfoSync = "0"
|
||||
DefaultAciOpflexAgentOpflexAsyncjsonEnabled = "false"
|
||||
DefaultAciOpflexAgentOvsAsyncjsonEnabled = "false"
|
||||
DefaultAciOpflexAgentPolicyRetryDelayTimer = "10"
|
||||
DefaultAciAciMultipod = "false"
|
||||
DefaultAciAciMultipodUbuntu = "false"
|
||||
DefaultAciDhcpRenewMaxRetryCount = "0"
|
||||
DefaultAciDhcpDelay = "0"
|
||||
|
||||
DefaultAciApicRefreshTime = "1200"
|
||||
DefaultAciOVSMemoryLimit = "1Gi"
|
||||
DefaultAciOVSMemoryRequest = "128Mi"
|
||||
DefaultAciImagePullPolicy = "Always"
|
||||
DefaultAciServiceMonitorInterval = "5"
|
||||
DefaultAciPBRTrackingNonSnat = "false"
|
||||
DefaultAciInstallIstio = "false"
|
||||
DefaultAciIstioProfile = "demo"
|
||||
DefaultAciDropLogEnable = "true"
|
||||
DefaultAciControllerLogLevel = "info"
|
||||
DefaultAciHostAgentLogLevel = "info"
|
||||
DefaultAciOpflexAgentLogLevel = "info"
|
||||
DefaultAciUseAciCniPriorityClass = "false"
|
||||
DefaultAciNoPriorityClass = "false"
|
||||
DefaultAciMaxNodesSvcGraph = "32"
|
||||
DefaultAciSnatContractScope = "global"
|
||||
DefaultAciSnatNamespace = "aci-containers-system"
|
||||
DefaultAciCApic = "false"
|
||||
DefaultAciPodSubnetChunkSize = "32"
|
||||
DefaultAciSnatPortRangeStart = "5000"
|
||||
DefaultAciSnatPortRangeEnd = "65000"
|
||||
DefaultAciSnatPortsPerNode = "3000"
|
||||
DefaultAciUseHostNetnsVolume = "false"
|
||||
DefaultAciRunGbpContainer = "false"
|
||||
DefaultAciRunOpflexServerContainer = "false"
|
||||
DefaultAciUseAciAnywhereCRD = "false"
|
||||
DefaultAciEnableEndpointSlice = "false"
|
||||
DefaultAciOpflexClientSSL = "true"
|
||||
DefaultAciUsePrivilegedContainer = "false"
|
||||
DefaultAciUseOpflexServerVolume = "false"
|
||||
DefaultAciDurationWaitForNetwork = "210"
|
||||
DefaultAciUseClusterRole = "true"
|
||||
DefaultAciDisableWaitForNetwork = "false"
|
||||
DefaultAciApicSubscriptionDelay = "0"
|
||||
DefaultAciApicRefreshTickerAdjust = "0"
|
||||
DefaultAciDisablePeriodicSnatGlobalInfoSync = "false"
|
||||
DefaultAciOpflexDeviceDeleteTimeout = "0"
|
||||
DefaultAciMTUHeadRoom = "0"
|
||||
DefaultAciNodePodIfEnable = "false"
|
||||
DefaultAciSriovEnable = "false"
|
||||
DefaultAciMultusDisable = "true"
|
||||
DefaultAciNoWaitForServiceEpReadiness = "false"
|
||||
DefaultAciAddExternalSubnetsToRdconfig = "false"
|
||||
DefaultAciServiceGraphEndpointAddDelay = "0"
|
||||
DefaultAciHppOptimization = "false"
|
||||
DefaultAciSleepTimeSnatGlobalInfoSync = "0"
|
||||
DefaultAciOpflexAgentOpflexAsyncjsonEnabled = "false"
|
||||
DefaultAciOpflexAgentOvsAsyncjsonEnabled = "false"
|
||||
DefaultAciOpflexAgentPolicyRetryDelayTimer = "10"
|
||||
DefaultAciOpflexDeviceReconnectWaitTimeout = "5"
|
||||
DefaultAciAciMultipod = "false"
|
||||
DefaultAciAciMultipodUbuntu = "false"
|
||||
DefaultAciDhcpRenewMaxRetryCount = "0"
|
||||
DefaultAciDhcpDelay = "0"
|
||||
DefaultAciUseSystemNodePriorityClass = "false"
|
||||
DefaultAciAciContainersMemoryLimit = "3Gi"
|
||||
DefaultAciAciContainersMemoryRequest = "128Mi"
|
||||
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
|
||||
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
|
||||
|
||||
@@ -646,6 +650,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
case AciNetworkPlugin:
|
||||
networkPluginConfigDefaultsMap = map[string]string{
|
||||
AciOVSMemoryLimit: DefaultAciOVSMemoryLimit,
|
||||
AciOVSMemoryRequest: DefaultAciOVSMemoryRequest,
|
||||
AciImagePullPolicy: DefaultAciImagePullPolicy,
|
||||
AciPBRTrackingNonSnat: DefaultAciPBRTrackingNonSnat,
|
||||
AciInstallIstio: DefaultAciInstallIstio,
|
||||
@@ -694,9 +699,13 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
AciOpflexAgentOvsAsyncjsonEnabled: DefaultAciOpflexAgentOvsAsyncjsonEnabled,
|
||||
AciOpflexAgentPolicyRetryDelayTimer: DefaultAciOpflexAgentPolicyRetryDelayTimer,
|
||||
AciAciMultipod: DefaultAciAciMultipod,
|
||||
AciOpflexDeviceReconnectWaitTimeout: DefaultAciOpflexDeviceReconnectWaitTimeout,
|
||||
AciAciMultipodUbuntu: DefaultAciAciMultipodUbuntu,
|
||||
AciDhcpRenewMaxRetryCount: DefaultAciDhcpRenewMaxRetryCount,
|
||||
AciDhcpDelay: DefaultAciDhcpDelay,
|
||||
AciUseSystemNodePriorityClass: DefaultAciUseSystemNodePriorityClass,
|
||||
AciContainersMemoryRequest: DefaultAciAciContainersMemoryRequest,
|
||||
AciContainersMemoryLimit: DefaultAciAciContainersMemoryLimit,
|
||||
}
|
||||
}
|
||||
if c.Network.CalicoNetworkProvider != nil {
|
||||
@@ -715,6 +724,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
}
|
||||
if c.Network.AciNetworkProvider != nil {
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OVSMemoryLimit, DefaultAciOVSMemoryLimit)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OVSMemoryRequest, DefaultAciOVSMemoryRequest)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.ImagePullPolicy, DefaultAciImagePullPolicy)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.PBRTrackingNonSnat, DefaultAciPBRTrackingNonSnat)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.InstallIstio, DefaultAciInstallIstio)
|
||||
@@ -762,10 +772,15 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexAgentOvsAsyncjsonEnabled, DefaultAciOpflexAgentOvsAsyncjsonEnabled)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexAgentPolicyRetryDelayTimer, DefaultAciOpflexAgentPolicyRetryDelayTimer)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.AciMultipod, DefaultAciAciMultipod)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.OpflexDeviceReconnectWaitTimeout, DefaultAciOpflexDeviceReconnectWaitTimeout)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.AciMultipodUbuntu, DefaultAciAciMultipodUbuntu)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DhcpRenewMaxRetryCount, DefaultAciDhcpRenewMaxRetryCount)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DhcpDelay, DefaultAciDhcpDelay)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseSystemNodePriorityClass, DefaultAciUseSystemNodePriorityClass)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.AciContainersMemoryLimit, DefaultAciAciContainersMemoryLimit)
|
||||
setDefaultIfEmpty(&c.Network.AciNetworkProvider.AciContainersMemoryRequest, DefaultAciAciContainersMemoryRequest)
|
||||
networkPluginConfigDefaultsMap[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciOVSMemoryRequest] = c.Network.AciNetworkProvider.OVSMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy
|
||||
networkPluginConfigDefaultsMap[AciPBRTrackingNonSnat] = c.Network.AciNetworkProvider.PBRTrackingNonSnat
|
||||
networkPluginConfigDefaultsMap[AciInstallIstio] = c.Network.AciNetworkProvider.InstallIstio
|
||||
@@ -815,6 +830,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
networkPluginConfigDefaultsMap[AciDhcpRenewMaxRetryCount] = c.Network.AciNetworkProvider.DhcpRenewMaxRetryCount
|
||||
networkPluginConfigDefaultsMap[AciDhcpDelay] = c.Network.AciNetworkProvider.DhcpDelay
|
||||
networkPluginConfigDefaultsMap[AciAciMultipod] = c.Network.AciNetworkProvider.AciMultipod
|
||||
networkPluginConfigDefaultsMap[AciOpflexDeviceReconnectWaitTimeout] = c.Network.AciNetworkProvider.OpflexDeviceReconnectWaitTimeout
|
||||
networkPluginConfigDefaultsMap[AciAciMultipodUbuntu] = c.Network.AciNetworkProvider.AciMultipodUbuntu
|
||||
networkPluginConfigDefaultsMap[AciSystemIdentifier] = c.Network.AciNetworkProvider.SystemIdentifier
|
||||
networkPluginConfigDefaultsMap[AciToken] = c.Network.AciNetworkProvider.Token
|
||||
@@ -849,6 +865,21 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
||||
networkPluginConfigDefaultsMap[AciOverlayVRFName] = c.Network.AciNetworkProvider.OverlayVRFName
|
||||
networkPluginConfigDefaultsMap[AciGbpPodSubnet] = c.Network.AciNetworkProvider.GbpPodSubnet
|
||||
networkPluginConfigDefaultsMap[AciOpflexServerPort] = c.Network.AciNetworkProvider.OpflexServerPort
|
||||
networkPluginConfigDefaultsMap[AciUseSystemNodePriorityClass] = c.Network.AciNetworkProvider.UseSystemNodePriorityClass
|
||||
networkPluginConfigDefaultsMap[AciAccProvisionOperatorMemoryRequest] = c.Network.AciNetworkProvider.AccProvisionOperatorMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciAccProvisionOperatorMemoryLimit] = c.Network.AciNetworkProvider.AccProvisionOperatorMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciAciContainersControllerMemoryRequest] = c.Network.AciNetworkProvider.AciContainersControllerMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciAciContainersControllerMemoryLimit] = c.Network.AciNetworkProvider.AciContainersControllerMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciAciContainersHostMemoryRequest] = c.Network.AciNetworkProvider.AciContainersHostMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciAciContainersHostMemoryLimit] = c.Network.AciNetworkProvider.AciContainersHostMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciAciContainersOperatorMemoryRequest] = c.Network.AciNetworkProvider.AciContainersOperatorMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciAciContainersOperatorMemoryLimit] = c.Network.AciNetworkProvider.AciContainersOperatorMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciMcastDaemonMemoryRequest] = c.Network.AciNetworkProvider.McastDaemonMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciMcastDaemonMemoryLimit] = c.Network.AciNetworkProvider.McastDaemonMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciOpflexAgentMemoryRequest] = c.Network.AciNetworkProvider.OpflexAgentMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciOpflexAgentMemoryLimit] = c.Network.AciNetworkProvider.OpflexAgentMemoryLimit
|
||||
networkPluginConfigDefaultsMap[AciAciContainersMemoryRequest] = c.Network.AciNetworkProvider.AciContainersMemoryRequest
|
||||
networkPluginConfigDefaultsMap[AciAciContainersMemoryLimit] = c.Network.AciNetworkProvider.AciContainersMemoryLimit
|
||||
}
|
||||
for k, v := range networkPluginConfigDefaultsMap {
|
||||
setDefaultIfEmptyMapValue(c.Network.Options, k, v)
|
||||
|
Reference in New Issue
Block a user