linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(inject): group resource requests/limits by type (#13769) 

In preparation for changes to CPU resource configuration, this commit reorders
the internals of the annotation overriding logic to group resource requests and
limits by type.
This commit is contained in:
Oliver Gould 2025-03-11 10:34:07 -07:00 committed by GitHub
parent 66e226d1eb
commit 9c29655e5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/inject/inject.go
View File

@ -372,24 +372,6 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s
}
}
if override, ok := annotations[k8s.ProxyMemoryRequestAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {
log.Warnf("%s (%s)", err, k8s.ProxyMemoryRequestAnnotation)
} else {
values.Proxy.Resources.Memory.Request = override
}
}
if override, ok := annotations[k8s.ProxyEphemeralStorageRequestAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {
log.Warnf("%s (%s)", err, k8s.ProxyEphemeralStorageRequestAnnotation)
} else {
values.Proxy.Resources.EphemeralStorage.Request = override
}
}
if override, ok := annotations[k8s.ProxyCPULimitAnnotation]; ok {
q, err := k8sResource.ParseQuantity(override)
if err != nil {
@ -405,6 +387,17 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s
}
}
// Proxy memory resources
if override, ok := annotations[k8s.ProxyMemoryRequestAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {
log.Warnf("%s (%s)", err, k8s.ProxyMemoryRequestAnnotation)
} else {
values.Proxy.Resources.Memory.Request = override
}
}
if override, ok := annotations[k8s.ProxyMemoryLimitAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {
@ -414,6 +407,17 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s
}
}
// Proxy ephemeral storage resources
if override, ok := annotations[k8s.ProxyEphemeralStorageRequestAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {
log.Warnf("%s (%s)", err, k8s.ProxyEphemeralStorageRequestAnnotation)
} else {
values.Proxy.Resources.EphemeralStorage.Request = override
}
}
if override, ok := annotations[k8s.ProxyEphemeralStorageLimitAnnotation]; ok {
_, err := k8sResource.ParseQuantity(override)
if err != nil {