Update memory capacity calculation

Author: deliahu

pkg/operator/operator/memory_capacity.go

@@ -98,29 +98,30 @@ func getMemoryCapacityFromConfigMap() (*kresource.Quantity, error) {
 	return &mem, nil
 }
 
-func updateMemoryCapacityConfigMap() (*kresource.Quantity, error) {
-	memFromConfig := config.Cluster.InstanceMetadata.Memory
-	memFromNodes, err := getMemoryCapacityFromNodes()
+func updateMemoryCapacityConfigMap() (kresource.Quantity, error) {
+	awsAdvertisedMem := config.Cluster.InstanceMetadata.Memory
+
+	nodeMemCapacity, err := getMemoryCapacityFromNodes()
 	if err != nil {
-		return nil, err
+		return kresource.Quantity{}, err
 	}
 
-	memFromConfigMap, err := getMemoryCapacityFromConfigMap()
+	previousMinMem, err := getMemoryCapacityFromConfigMap()
 	if err != nil {
-		return nil, err
+		return kresource.Quantity{}, err
 	}
 
-	minMem := k8s.QuantityPtr(memFromConfig.DeepCopy())
+	minMem := awsAdvertisedMem
 
-	if memFromNodes != nil && minMem.Cmp(*memFromNodes) > 0 {
-		minMem = memFromNodes
+	if nodeMemCapacity != nil && minMem.Cmp(*nodeMemCapacity) > 0 {
+		minMem = *nodeMemCapacity
 	}
 
-	if memFromConfigMap != nil && minMem.Cmp(*memFromConfigMap) > 0 {
-		minMem = memFromConfigMap
+	if previousMinMem != nil && minMem.Cmp(*previousMinMem) > 0 {
+		minMem = *previousMinMem
 	}
 
-	if memFromConfigMap == nil || minMem.Cmp(*memFromConfigMap) != 0 {
+	if previousMinMem == nil || minMem.Cmp(*previousMinMem) < 0 {
 		configMap := k8s.ConfigMap(&k8s.ConfigMapSpec{
 			Name: _memConfigMapName,
 			Data: map[string]string{
@@ -130,7 +131,7 @@ func updateMemoryCapacityConfigMap() (*kresource.Quantity, error) {
 
 		_, err := config.K8s.ApplyConfigMap(configMap)
 		if err != nil {
-			return nil, err
+			return kresource.Quantity{}, err
 		}
 	}
 

pkg/operator/operator/validations.go

@@ -102,7 +102,7 @@ func ValidateClusterAPIs(apis []userconfig.API, projectFiles spec.ProjectFiles)
 	return nil
 }
 
-func validateK8s(api *userconfig.API, virtualServices []istioclientnetworking.VirtualService, maxMem *kresource.Quantity) error {
+func validateK8s(api *userconfig.API, virtualServices []istioclientnetworking.VirtualService, maxMem kresource.Quantity) error {
 	if err := validateK8sCompute(api.Compute, maxMem); err != nil {
 		return errors.Wrap(err, api.Identify(), userconfig.ComputeKey)
 	}
@@ -114,7 +114,7 @@ func validateK8s(api *userconfig.API, virtualServices []istioclientnetworking.Vi
 	return nil
 }
 
-func validateK8sCompute(compute *userconfig.Compute, maxMem *kresource.Quantity) error {
+func validateK8sCompute(compute *userconfig.Compute, maxMem kresource.Quantity) error {
 	maxMem.Sub(_cortexMemReserve)
 
 	maxCPU := config.Cluster.InstanceMetadata.CPU
@@ -183,9 +183,9 @@ func findDuplicateEndpoints(apis []userconfig.API) []userconfig.API {
 	return nil
 }
 
-func getValidationK8sResources() ([]istioclientnetworking.VirtualService, *kresource.Quantity, error) {
+func getValidationK8sResources() ([]istioclientnetworking.VirtualService, kresource.Quantity, error) {
 	var virtualServices []istioclientnetworking.VirtualService
-	var maxMem *kresource.Quantity
+	var maxMem kresource.Quantity
 
 	err := parallel.RunFirstErr(
 		func() error {