From b6e90050371ef06b7c8ff95d93ef02f76a737a78 Mon Sep 17 00:00:00 2001 From: "trusihin.andrey" Date: Wed, 27 Aug 2025 09:26:47 +0300 Subject: [PATCH] Fix variables name --- functions/onprem/orborus/orborus.go | 38 ++++++++++++++--------------- functions/onprem/worker/worker.go | 38 ++++++++++++++--------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index 6d0d73ea..7e212505 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -788,42 +788,42 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar { } func buildResourcesFromEnv() corev1.ResourceRequirements { - reqs := corev1.ResourceList{} - lims := corev1.ResourceList{} + requests := corev1.ResourceList{} + limits := corev1.ResourceList{} type item struct { - env string - rn corev1.ResourceName - to *corev1.ResourceList + env string + resourceName corev1.ResourceName + resourceList corev1.ResourceList } items := []item{ // kubernetes requests - {env: "SHUFFLE_WORKER_CPU_REQUEST", rn: corev1.ResourceCPU, to: &reqs}, - {env: "SHUFFLE_WORKER_MEMORY_REQUEST", rn: corev1.ResourceMemory, to: &reqs}, - {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_REQUEST", rn: corev1.ResourceEphemeralStorage, to: &reqs}, + {env: "SHUFFLE_WORKER_CPU_REQUEST", resourceName: corev1.ResourceCPU, resourceList: requests}, + {env: "SHUFFLE_WORKER_MEMORY_REQUEST", resourceName: corev1.ResourceMemory, resourceList: requests}, + {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_REQUEST", resourceName: corev1.ResourceEphemeralStorage, resourceList: requests}, // kubernetes limits - {env: "SHUFFLE_WORKER_CPU_LIMIT", rn: corev1.ResourceCPU, to: &lims}, - {env: "SHUFFLE_WORKER_MEMORY_LIMIT", rn: corev1.ResourceMemory, to: &lims}, - {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_LIMIT", rn: corev1.ResourceEphemeralStorage, to: &lims}, + {env: "SHUFFLE_WORKER_CPU_LIMIT", resourceName: corev1.ResourceCPU, resourceList: limits}, + {env: "SHUFFLE_WORKER_MEMORY_LIMIT", resourceName: corev1.ResourceMemory, resourceList: limits}, + {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_LIMIT", resourceName: corev1.ResourceEphemeralStorage, resourceList: limits}, } for _, it := range items { - if v := strings.TrimSpace(os.Getenv(it.env)); v != "" { - if q, err := resource.ParseQuantity(v); err == nil { - (*it.to)[it.rn] = q + if value := strings.TrimSpace(os.Getenv(it.env)); value != "" { + if quantity, err := resource.ParseQuantity(value); err == nil { + it.resourceList[it.resourceName] = quantity } else { - log.Printf("[WARN] Cannot parse %s=%q as resource quantity: %v", it.env, v, err) + log.Printf("[WARNING] Cannot parse %s=%q as resource quantity: %v", it.env, value, err) } } } rr := corev1.ResourceRequirements{} - if len(reqs) > 0 { - rr.Requests = reqs + if len(requests) > 0 { + rr.Requests = requests } - if len(lims) > 0 { - rr.Limits = lims + if len(limits) > 0 { + rr.Limits = limits } return rr diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go index 133545f3..3489666c 100644 --- a/functions/onprem/worker/worker.go +++ b/functions/onprem/worker/worker.go @@ -2379,42 +2379,42 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar { } func buildResourcesFromEnv() corev1.ResourceRequirements { - reqs := corev1.ResourceList{} - lims := corev1.ResourceList{} + requests := corev1.ResourceList{} + limits := corev1.ResourceList{} type item struct { - env string - rn corev1.ResourceName - to *corev1.ResourceList + env string + resourceName corev1.ResourceName + resourceList corev1.ResourceList } items := []item{ // kubernetes requests - {env: "SHUFFLE_APP_CPU_REQUEST", rn: corev1.ResourceCPU, to: &reqs}, - {env: "SHUFFLE_APP_MEMORY_REQUEST", rn: corev1.ResourceMemory, to: &reqs}, - {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_REQUEST", rn: corev1.ResourceEphemeralStorage, to: &reqs}, + {env: "SHUFFLE_APP_CPU_REQUEST", resourceName: corev1.ResourceCPU, resourceList: requests}, + {env: "SHUFFLE_APP_MEMORY_REQUEST", resourceName: corev1.ResourceMemory, resourceList: requests}, + {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_REQUEST", resourceName: corev1.ResourceEphemeralStorage, resourceList: requests}, // kubernetes limits - {env: "SHUFFLE_APP_CPU_LIMIT", rn: corev1.ResourceCPU, to: &lims}, - {env: "SHUFFLE_APP_MEMORY_LIMIT", rn: corev1.ResourceMemory, to: &lims}, - {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_LIMIT", rn: corev1.ResourceEphemeralStorage, to: &lims}, + {env: "SHUFFLE_APP_CPU_LIMIT", resourceName: corev1.ResourceCPU, resourceList: limits}, + {env: "SHUFFLE_APP_MEMORY_LIMIT", resourceName: corev1.ResourceMemory, resourceList: limits}, + {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_LIMIT", resourceName: corev1.ResourceEphemeralStorage, resourceList: limits}, } for _, it := range items { - if v := strings.TrimSpace(os.Getenv(it.env)); v != "" { - if q, err := resource.ParseQuantity(v); err == nil { - (*it.to)[it.rn] = q + if value := strings.TrimSpace(os.Getenv(it.env)); value != "" { + if quantity, err := resource.ParseQuantity(value); err == nil { + it.resourceList[it.resourceName] = quantity } else { - log.Printf("[WARN] Cannot parse %s=%q as resource quantity: %v", it.env, v, err) + log.Printf("[WARNING] Cannot parse %s=%q as resource quantity: %v", it.env, value, err) } } } rr := corev1.ResourceRequirements{} - if len(reqs) > 0 { - rr.Requests = reqs + if len(requests) > 0 { + rr.Requests = requests } - if len(lims) > 0 { - rr.Limits = lims + if len(limits) > 0 { + rr.Limits = limits } return rr