[Bugfix] Allow to remove resources (CPU & Memory) on the managed pods (#1034)

jwierzbo · web-flow · commit 0593626a1c56 · 2022-06-28T23:57:03.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - (Bugfix) Ensure Wait actions to be present after AddMember
 - (Documentation) Refactor metrics (Part 1)
 - (Bugfix) Extend Agency HealthCheck for replace
+- (Bugfix) Allow to remove resources (CPU & Memory) on the managed pods
 
 ## [1.2.13](https://github.com/arangodb/kube-arangodb/tree/1.2.13) (2022-06-07)
 - (Bugfix) Fix arangosync members state inspection
diff --git a/pkg/apis/deployment/v1/deployment_metrics_spec.go b/pkg/apis/deployment/v1/deployment_metrics_spec.go
@@ -148,8 +148,8 @@ func (s *MetricsSpec) SetDefaultsFrom(source MetricsSpec) {
 	if s.Authentication.JWTTokenSecretName == nil {
 		s.Authentication.JWTTokenSecretName = util.NewStringOrNil(source.Authentication.JWTTokenSecretName)
 	}
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 }
 
 // Validate the given spec
diff --git a/pkg/apis/deployment/v1/lifecycle_spec.go b/pkg/apis/deployment/v1/lifecycle_spec.go
@@ -30,6 +30,6 @@ type LifecycleSpec struct {
 
 // SetDefaultsFrom fills unspecified fields with a value from given source spec.
 func (s *LifecycleSpec) SetDefaultsFrom(source LifecycleSpec) {
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 }
diff --git a/pkg/apis/deployment/v1/server_group_spec.go b/pkg/apis/deployment/v1/server_group_spec.go
@@ -620,14 +620,16 @@ func (s *ServerGroupSpec) SetDefaults(group ServerGroup, used bool, mode Deploym
 	}
 }
 
-// setDefaultsFromResourceList fills unspecified fields with a value from given source spec.
-func setDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {
+// setStorageDefaultsFromResourceList fills unspecified storage-type fields with a value from given source spec.
+func setStorageDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {
 	for k, v := range source {
 		if *s == nil {
 			*s = make(core.ResourceList)
 		}
 		if _, found := (*s)[k]; !found {
-			(*s)[k] = v
+			if k != core.ResourceCPU && k != core.ResourceMemory {
+				(*s)[k] = v
+			}
 		}
 	}
 }
@@ -658,8 +660,8 @@ func (s *ServerGroupSpec) SetDefaultsFrom(source ServerGroupSpec) {
 	if s.NodeSelector == nil {
 		s.NodeSelector = source.NodeSelector
 	}
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 	if s.VolumeClaimTemplate == nil {
 		s.VolumeClaimTemplate = source.VolumeClaimTemplate.DeepCopy()
 	}
diff --git a/pkg/apis/deployment/v2alpha1/deployment_metrics_spec.go b/pkg/apis/deployment/v2alpha1/deployment_metrics_spec.go
@@ -148,8 +148,8 @@ func (s *MetricsSpec) SetDefaultsFrom(source MetricsSpec) {
 	if s.Authentication.JWTTokenSecretName == nil {
 		s.Authentication.JWTTokenSecretName = util.NewStringOrNil(source.Authentication.JWTTokenSecretName)
 	}
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 }
 
 // Validate the given spec
diff --git a/pkg/apis/deployment/v2alpha1/lifecycle_spec.go b/pkg/apis/deployment/v2alpha1/lifecycle_spec.go
@@ -30,6 +30,6 @@ type LifecycleSpec struct {
 
 // SetDefaultsFrom fills unspecified fields with a value from given source spec.
 func (s *LifecycleSpec) SetDefaultsFrom(source LifecycleSpec) {
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 }
diff --git a/pkg/apis/deployment/v2alpha1/server_group_spec.go b/pkg/apis/deployment/v2alpha1/server_group_spec.go
@@ -620,14 +620,16 @@ func (s *ServerGroupSpec) SetDefaults(group ServerGroup, used bool, mode Deploym
 	}
 }
 
-// setDefaultsFromResourceList fills unspecified fields with a value from given source spec.
-func setDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {
+// setStorageDefaultsFromResourceList fills unspecified storage-type fields with a value from given source spec.
+func setStorageDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {
 	for k, v := range source {
 		if *s == nil {
 			*s = make(core.ResourceList)
 		}
 		if _, found := (*s)[k]; !found {
-			(*s)[k] = v
+			if k != core.ResourceCPU && k != core.ResourceMemory {
+				(*s)[k] = v
+			}
 		}
 	}
 }
@@ -658,8 +660,8 @@ func (s *ServerGroupSpec) SetDefaultsFrom(source ServerGroupSpec) {
 	if s.NodeSelector == nil {
 		s.NodeSelector = source.NodeSelector
 	}
-	setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
-	setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
+	setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)
+	setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)
 	if s.VolumeClaimTemplate == nil {
 		s.VolumeClaimTemplate = source.VolumeClaimTemplate.DeepCopy()
 	}

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ func (s *MetricsSpec) SetDefaultsFrom(source MetricsSpec) {`
`148`	`148`	`if s.Authentication.JWTTokenSecretName == nil {`
`149`	`149`	`s.Authentication.JWTTokenSecretName = util.NewStringOrNil(source.Authentication.JWTTokenSecretName)`
`150`	`150`	`}`
`151`		`- setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
`152`		`- setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
	`151`	`+ setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
	`152`	`+ setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`// Validate the given spec`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ type LifecycleSpec struct {`
`30`	`30`
`31`	`31`	`// SetDefaultsFrom fills unspecified fields with a value from given source spec.`
`32`	`32`	`func (s *LifecycleSpec) SetDefaultsFrom(source LifecycleSpec) {`
`33`		`- setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
`34`		`- setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
	`33`	`+ setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
	`34`	`+ setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -620,14 +620,16 @@ func (s *ServerGroupSpec) SetDefaults(group ServerGroup, used bool, mode Deploym`
`620`	`620`	`}`
`621`	`621`	`}`
`622`	`622`
`623`		`-// setDefaultsFromResourceList fills unspecified fields with a value from given source spec.`
`624`		`-func setDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {`
	`623`	`+// setStorageDefaultsFromResourceList fills unspecified storage-type fields with a value from given source spec.`
	`624`	`+func setStorageDefaultsFromResourceList(s *core.ResourceList, source core.ResourceList) {`
`625`	`625`	`for k, v := range source {`
`626`	`626`	`if *s == nil {`
`627`	`627`	`*s = make(core.ResourceList)`
`628`	`628`	`}`
`629`	`629`	`if _, found := (*s)[k]; !found {`
`630`		`- (*s)[k] = v`
	`630`	`+ if k != core.ResourceCPU && k != core.ResourceMemory {`
	`631`	`+ (*s)[k] = v`
	`632`	`+ }`
`631`	`633`	`}`
`632`	`634`	`}`
`633`	`635`	`}`
`@@ -658,8 +660,8 @@ func (s *ServerGroupSpec) SetDefaultsFrom(source ServerGroupSpec) {`
`658`	`660`	`if s.NodeSelector == nil {`
`659`	`661`	`s.NodeSelector = source.NodeSelector`
`660`	`662`	`}`
`661`		`- setDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
`662`		`- setDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
	`663`	`+ setStorageDefaultsFromResourceList(&s.Resources.Limits, source.Resources.Limits)`
	`664`	`+ setStorageDefaultsFromResourceList(&s.Resources.Requests, source.Resources.Requests)`
`663`	`665`	`if s.VolumeClaimTemplate == nil {`
`664`	`666`	`s.VolumeClaimTemplate = source.VolumeClaimTemplate.DeepCopy()`
`665`	`667`	`}`