diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index 00a92aabe..91987eb91 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -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 {