merge 1.4.9 into 1.4

cluster/defaults.go

@@ -77,6 +77,7 @@ const (
 
 	DefaultAciApicRefreshTime                        = "1200"
 	DefaultAciOVSMemoryLimit                         = "1Gi"
+	DefaultAciOVSMemoryRequest                       = "128Mi"
 	DefaultAciImagePullPolicy                        = "Always"
 	DefaultAciServiceMonitorInterval                 = "5"
 	DefaultAciPBRTrackingNonSnat                     = "false"
@@ -123,11 +124,14 @@ const (
 	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"
 
@@ -776,6 +780,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
 	case AciNetworkPlugin:
 		networkPluginConfigDefaultsMap = map[string]string{
 			AciOVSMemoryLimit:                    DefaultAciOVSMemoryLimit,
+			AciOVSMemoryRequest:                  DefaultAciOVSMemoryRequest,
 			AciImagePullPolicy:                   DefaultAciImagePullPolicy,
 			AciPBRTrackingNonSnat:                DefaultAciPBRTrackingNonSnat,
 			AciInstallIstio:                      DefaultAciInstallIstio,
@@ -824,9 +829,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 {
@@ -845,6 +854,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)
@@ -892,10 +902,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
@@ -945,6 +960,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
@@ -979,6 +995,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)

cluster/network.go

@@ -77,6 +77,7 @@ const (
 
 	AciNetworkPlugin                        = "aci"
 	AciOVSMemoryLimit                       = "aci_ovs_memory_limit"
+	AciOVSMemoryRequest                     = "aci_ovs_memory_request"
 	AciImagePullPolicy                      = "aci_image_pull_policy"
 	AciPBRTrackingNonSnat                   = "aci_pbr_tracking_non_snat"
 	AciInstallIstio                         = "aci_install_istio"
@@ -156,9 +157,25 @@ const (
 	AciOpflexAgentOvsAsyncjsonEnabled       = "aci_opflex_agent_ovs_asyncjson_enabled"
 	AciOpflexAgentPolicyRetryDelayTimer     = "aci_opflex_agent_policy_retry_delay_timer"
 	AciAciMultipod                          = "aci_aci_multipod"
+	AciOpflexDeviceReconnectWaitTimeout     = "aci_opflex_device_reconnect_wait_timeout"
 	AciAciMultipodUbuntu                    = "aci_aci_multipod_ubuntu"
 	AciDhcpRenewMaxRetryCount               = "aci_dhcp_renew_max_retry_count"
 	AciDhcpDelay                            = "aci_dhcp_delay"
+	AciUseSystemNodePriorityClass           = "aci_use_system_node_priority_class"
+	AciAccProvisionOperatorMemoryRequest    = "aci_acc_provision_operator_memory_request"
+	AciAccProvisionOperatorMemoryLimit      = "aci_acc_provision_operator_memory_limit"
+	AciAciContainersControllerMemoryRequest = "aci_aci_containers_controller_memory_request"
+	AciAciContainersControllerMemoryLimit   = "aci_aci_containers_controller_memory_limit"
+	AciAciContainersHostMemoryRequest       = "aci_aci_containers_host_memory_request"
+	AciAciContainersHostMemoryLimit         = "aci_aci_containers_host_memory_limit"
+	AciAciContainersOperatorMemoryRequest   = "aci_aci_containers_operator_memory_request"
+	AciAciContainersOperatorMemoryLimit     = "aci_aci_containers_operator_memory_limit"
+	AciMcastDaemonMemoryRequest             = "aci_mcast_daemon_memory_request"
+	AciMcastDaemonMemoryLimit               = "aci_mcast_daemon_memory_limit"
+	AciOpflexAgentMemoryRequest             = "aci_opflex_agent_memory_request"
+	AciOpflexAgentMemoryLimit               = "aci_opflex_agent_memory_limit"
+	AciAciContainersMemoryRequest           = "aci_aci_containers_memory_request"
+	AciAciContainersMemoryLimit             = "aci_aci_containers_memory_limit"
 	// List of map keys to be used with network templates
 
 	// EtcdEndpoints is the server address for Etcd, used by calico
@@ -303,14 +320,31 @@ const (
 	OpflexAgentOvsAsyncjsonEnabled         = "OpflexAgentOvsAsyncjsonEnabled"
 	OpflexAgentPolicyRetryDelayTimer       = "OpflexAgentPolicyRetryDelayTimer"
 	AciMultipod                            = "AciMultipod"
+	OpflexDeviceReconnectWaitTimeout       = "OpflexDeviceReconnectWaitTimeout"
 	AciMultipodUbuntu                      = "AciMultipodUbuntu"
 	DhcpRenewMaxRetryCount                 = "DhcpRenewMaxRetryCount"
 	DhcpDelay                              = "DhcpDelay"
 	OVSMemoryLimit                         = "OVSMemoryLimit"
+	OVSMemoryRequest                       = "OVSMemoryRequest"
 	NodeSubnet                             = "NodeSubnet"
 	NodeSelector                           = "NodeSelector"
 	UpdateStrategy                         = "UpdateStrategy"
 	Tolerations                            = "Tolerations"
+	UseSystemNodePriorityClass             = "UseSystemNodePriorityClass"
+	AccProvisionOperatorMemoryRequest      = "AccProvisionOperatorMemoryRequest"
+	AccProvisionOperatorMemoryLimit        = "AccProvisionOperatorMemoryLimit"
+	AciContainersControllerMemoryRequest   = "AciContainersControllerMemoryRequest"
+	AciContainersControllerMemoryLimit     = "AciContainersControllerMemoryLimit"
+	AciContainersHostMemoryRequest         = "AciContainersHostMemoryRequest"
+	AciContainersHostMemoryLimit           = "AciContainersHostMemoryLimit"
+	AciContainersOperatorMemoryRequest     = "AciContainersOperatorMemoryRequest"
+	AciContainersOperatorMemoryLimit       = "AciContainersOperatorMemoryLimit"
+	McastDaemonMemoryRequest               = "McastDaemonMemoryRequest"
+	McastDaemonMemoryLimit                 = "McastDaemonMemoryLimit"
+	OpflexAgentMemoryRequest               = "OpflexAgentMemoryRequest"
+	OpflexAgentMemoryLimit                 = "OpflexAgentMemoryLimit"
+	AciContainersMemoryRequest             = "AciContainersMemoryRequest"
+	AciContainersMemoryLimit               = "AciContainersMemoryLimit"
 )
 
 type IPPool struct {
@@ -598,6 +632,7 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
 		HostAgentLogLevel:                    c.Network.Options[AciHostAgentLogLevel],
 		OpflexAgentLogLevel:                  c.Network.Options[AciOpflexAgentLogLevel],
 		OVSMemoryLimit:                       c.Network.Options[AciOVSMemoryLimit],
+		OVSMemoryRequest:                     c.Network.Options[AciOVSMemoryRequest],
 		ClusterCIDR:                          c.ClusterCIDR,
 		PodNetwork:                           podNetwork,
 		PodIPPool:                            podIPPool,
@@ -654,9 +689,25 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
 		OpflexAgentOvsAsyncjsonEnabled:       c.Network.Options[AciOpflexAgentOvsAsyncjsonEnabled],
 		OpflexAgentPolicyRetryDelayTimer:     c.Network.Options[AciOpflexAgentPolicyRetryDelayTimer],
 		AciMultipod:                          c.Network.Options[AciAciMultipod],
+		OpflexDeviceReconnectWaitTimeout:     c.Network.Options[AciOpflexDeviceReconnectWaitTimeout],
 		AciMultipodUbuntu:                    c.Network.Options[AciAciMultipodUbuntu],
 		DhcpRenewMaxRetryCount:               c.Network.Options[AciDhcpRenewMaxRetryCount],
 		DhcpDelay:                            c.Network.Options[AciDhcpDelay],
+		UseSystemNodePriorityClass:           c.Network.Options[AciUseSystemNodePriorityClass],
+		AccProvisionOperatorMemoryRequest:    c.Network.Options[AciAccProvisionOperatorMemoryRequest],
+		AccProvisionOperatorMemoryLimit:      c.Network.Options[AciAccProvisionOperatorMemoryLimit],
+		AciContainersControllerMemoryRequest: c.Network.Options[AciAciContainersControllerMemoryRequest],
+		AciContainersControllerMemoryLimit:   c.Network.Options[AciAciContainersControllerMemoryLimit],
+		AciContainersHostMemoryRequest:       c.Network.Options[AciAciContainersHostMemoryRequest],
+		AciContainersHostMemoryLimit:         c.Network.Options[AciAciContainersHostMemoryLimit],
+		AciContainersOperatorMemoryRequest:   c.Network.Options[AciAciContainersOperatorMemoryRequest],
+		AciContainersOperatorMemoryLimit:     c.Network.Options[AciAciContainersOperatorMemoryLimit],
+		McastDaemonMemoryRequest:             c.Network.Options[AciMcastDaemonMemoryRequest],
+		McastDaemonMemoryLimit:               c.Network.Options[AciMcastDaemonMemoryLimit],
+		OpflexAgentMemoryRequest:             c.Network.Options[AciOpflexAgentMemoryRequest],
+		OpflexAgentMemoryLimit:               c.Network.Options[AciOpflexAgentMemoryLimit],
+		AciContainersMemoryRequest:           c.Network.Options[AciAciContainersMemoryRequest],
+		AciContainersMemoryLimit:             c.Network.Options[AciAciContainersMemoryLimit],
 		AciCniDeployContainer:                c.SystemImages.AciCniDeployContainer,
 		AciHostContainer:                     c.SystemImages.AciHostContainer,
 		AciOpflexContainer:                   c.SystemImages.AciOpflexContainer,

types/rke_types.go

@@ -618,6 +618,7 @@ type AciNetworkProvider struct {
 	InfraVlan                            string              `yaml:"infra_vlan,omitempty" json:"infraVlan,omitempty"`
 	Tenant                               string              `yaml:"tenant,omitempty" json:"tenant,omitempty"`
 	OVSMemoryLimit                       string              `yaml:"ovs_memory_limit,omitempty" json:"ovsMemoryLimit,omitempty"`
+	OVSMemoryRequest                     string              `yaml:"ovs_memory_request,omitempty" json:"ovsMemoryRequest,omitempty"`
 	ImagePullPolicy                      string              `yaml:"image_pull_policy,omitempty" json:"imagePullPolicy,omitempty"`
 	ImagePullSecret                      string              `yaml:"image_pull_secret,omitempty" json:"imagePullSecret,omitempty"`
 	ServiceMonitorInterval               string              `yaml:"service_monitor_interval,omitempty" json:"serviceMonitorInterval,omitempty"`
@@ -676,9 +677,25 @@ type AciNetworkProvider struct {
 	OpflexAgentOvsAsyncjsonEnabled       string              `yaml:"opflex_agent_ovs_asyncjson_enabled,omitempty" json:"opflexAgentOvsAsyncjsonEnabled,omitempty"`
 	OpflexAgentPolicyRetryDelayTimer     string              `yaml:"opflex_agent_policy_retry_delay_timer,omitempty" json:"opflexAgentPolicyRetryDelayTimer,omitempty"`
 	AciMultipod                          string              `yaml:"aci_multipod,omitempty" json:"aciMultipod,omitempty"`
+	OpflexDeviceReconnectWaitTimeout     string              `yaml:"opflex_device_reconnect_wait_timeout,omitempty" json:"opflexDeviceReconnectWaitTimeout,omitempty"`
 	AciMultipodUbuntu                    string              `yaml:"aci_multipod_ubuntu,omitempty" json:"aciMultipodUbuntu,omitempty"`
 	DhcpRenewMaxRetryCount               string              `yaml:"dhcp_renew_max_retry_count,omitempty" json:"dhcpRenewMaxRetryCount,omitempty"`
 	DhcpDelay                            string              `yaml:"dhcp_delay,omitempty" json:"dhcpDelay,omitempty"`
+	UseSystemNodePriorityClass           string              `yaml:"use_system_node_priority_class,omitempty" json:"useSystemNodePriorityClass,omitempty"`
+	AccProvisionOperatorMemoryRequest    string              `yaml:"acc_provision_operator_memory_request,omitempty" json:"accProvisionOperatorMemoryRequest,omitempty"`
+	AccProvisionOperatorMemoryLimit      string              `yaml:"acc_provision_operator_memory_limit,omitempty" json:"accProvisionOperatorMemoryLimit,omitempty"`
+	AciContainersControllerMemoryRequest string              `yaml:"aci_containers_controller_memory_request,omitempty" json:"aciContainersControllerMemoryRequest,omitempty"`
+	AciContainersControllerMemoryLimit   string              `yaml:"aci_containers_controller_memory_limit,omitempty" json:"aciContainersControllerMemoryLimit,omitempty"`
+	AciContainersHostMemoryRequest       string              `yaml:"aci_containers_host_memory_request,omitempty" json:"aciContainersHostMemoryRequest,omitempty"`
+	AciContainersHostMemoryLimit         string              `yaml:"aci_containers_host_memory_limit,omitempty" json:"aciContainersHostMemoryLimit,omitempty"`
+	AciContainersOperatorMemoryRequest   string              `yaml:"aci_containers_operator_memory_request,omitempty" json:"aciContainersOperatorMemoryRequest,omitempty"`
+	AciContainersOperatorMemoryLimit     string              `yaml:"aci_containers_operator_memory_limit,omitempty" json:"aciContainersOperatorMemoryLimit,omitempty"`
+	McastDaemonMemoryRequest             string              `yaml:"mcast_daemon_memory_request,omitempty" json:"mcastDaemonMemoryRequest,omitempty"`
+	McastDaemonMemoryLimit               string              `yaml:"mcast_daemon_memory_limit,omitempty" json:"mcastDaemonMemoryLimit,omitempty"`
+	OpflexAgentMemoryRequest             string              `yaml:"opflex_agent_memory_request,omitempty" json:"opflexAgentMemoryRequest,omitempty"`
+	OpflexAgentMemoryLimit               string              `yaml:"opflex_agent_memory_limit,omitempty" json:"opflexAgentMemoryLimit,omitempty"`
+	AciContainersMemoryRequest           string              `yaml:"aci_containers_memory_request,omitempty" json:"aciContainersMemoryRequest,omitempty"`
+	AciContainersMemoryLimit             string              `yaml:"aci_containers_memory_limit,omitempty" json:"aciContainersMemoryLimit,omitempty"`
 }
 
 type KubernetesServicesOptions struct {