marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix variables name

Browse Source
This commit is contained in:
trusihin.andrey
2025-08-27 09:26:47 +03:00
parent dd89bbdd33
commit b6e9005037
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+19 -19
View File
@@ -788,42 +788,42 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar {
} }
func buildResourcesFromEnv() corev1.ResourceRequirements { func buildResourcesFromEnv() corev1.ResourceRequirements {
reqs := corev1.ResourceList{} requests := corev1.ResourceList{}
lims := corev1.ResourceList{} limits := corev1.ResourceList{}
type item struct { type item struct {
env string env string
rn corev1.ResourceName resourceName corev1.ResourceName
to *corev1.ResourceList resourceList corev1.ResourceList
} }
items := []item{ items := []item{
// kubernetes requests // kubernetes requests
{env: "SHUFFLE_WORKER_CPU_REQUEST", rn: corev1.ResourceCPU, to: &reqs}, {env: "SHUFFLE_WORKER_CPU_REQUEST", resourceName: corev1.ResourceCPU, resourceList: requests},
{env: "SHUFFLE_WORKER_MEMORY_REQUEST", rn: corev1.ResourceMemory, to: &reqs}, {env: "SHUFFLE_WORKER_MEMORY_REQUEST", resourceName: corev1.ResourceMemory, resourceList: requests},
{env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_REQUEST", rn: corev1.ResourceEphemeralStorage, to: &reqs}, {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_REQUEST", resourceName: corev1.ResourceEphemeralStorage, resourceList: requests},
// kubernetes limits // kubernetes limits
{env: "SHUFFLE_WORKER_CPU_LIMIT", rn: corev1.ResourceCPU, to: &lims}, {env: "SHUFFLE_WORKER_CPU_LIMIT", resourceName: corev1.ResourceCPU, resourceList: limits},
{env: "SHUFFLE_WORKER_MEMORY_LIMIT", rn: corev1.ResourceMemory, to: &lims}, {env: "SHUFFLE_WORKER_MEMORY_LIMIT", resourceName: corev1.ResourceMemory, resourceList: limits},
{env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_LIMIT", rn: corev1.ResourceEphemeralStorage, to: &lims}, {env: "SHUFFLE_WORKER_EPHEMERAL_STORAGE_LIMIT", resourceName: corev1.ResourceEphemeralStorage, resourceList: limits},
} }
for _, it := range items { for _, it := range items {
if v := strings.TrimSpace(os.Getenv(it.env)); v != "" { if value := strings.TrimSpace(os.Getenv(it.env)); value != "" {
if q, err := resource.ParseQuantity(v); err == nil { if quantity, err := resource.ParseQuantity(value); err == nil {
(*it.to)[it.rn] = q it.resourceList[it.resourceName] = quantity
} else { } 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{} rr := corev1.ResourceRequirements{}
if len(reqs) > 0 { if len(requests) > 0 {
rr.Requests = reqs rr.Requests = requests
} }
if len(lims) > 0 { if len(limits) > 0 {
rr.Limits = lims rr.Limits = limits
} }
return rr return rr
functions/onprem/worker/worker.go
+19 -19
View File
@@ -2379,42 +2379,42 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar {
} }
func buildResourcesFromEnv() corev1.ResourceRequirements { func buildResourcesFromEnv() corev1.ResourceRequirements {
reqs := corev1.ResourceList{} requests := corev1.ResourceList{}
lims := corev1.ResourceList{} limits := corev1.ResourceList{}
type item struct { type item struct {
env string env string
rn corev1.ResourceName resourceName corev1.ResourceName
to *corev1.ResourceList resourceList corev1.ResourceList
} }
items := []item{ items := []item{
// kubernetes requests // kubernetes requests
{env: "SHUFFLE_APP_CPU_REQUEST", rn: corev1.ResourceCPU, to: &reqs}, {env: "SHUFFLE_APP_CPU_REQUEST", resourceName: corev1.ResourceCPU, resourceList: requests},
{env: "SHUFFLE_APP_MEMORY_REQUEST", rn: corev1.ResourceMemory, to: &reqs}, {env: "SHUFFLE_APP_MEMORY_REQUEST", resourceName: corev1.ResourceMemory, resourceList: requests},
{env: "SHUFFLE_APP_EPHEMERAL_STORAGE_REQUEST", rn: corev1.ResourceEphemeralStorage, to: &reqs}, {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_REQUEST", resourceName: corev1.ResourceEphemeralStorage, resourceList: requests},
// kubernetes limits // kubernetes limits
{env: "SHUFFLE_APP_CPU_LIMIT", rn: corev1.ResourceCPU, to: &lims}, {env: "SHUFFLE_APP_CPU_LIMIT", resourceName: corev1.ResourceCPU, resourceList: limits},
{env: "SHUFFLE_APP_MEMORY_LIMIT", rn: corev1.ResourceMemory, to: &lims}, {env: "SHUFFLE_APP_MEMORY_LIMIT", resourceName: corev1.ResourceMemory, resourceList: limits},
{env: "SHUFFLE_APP_EPHEMERAL_STORAGE_LIMIT", rn: corev1.ResourceEphemeralStorage, to: &lims}, {env: "SHUFFLE_APP_EPHEMERAL_STORAGE_LIMIT", resourceName: corev1.ResourceEphemeralStorage, resourceList: limits},
} }
for _, it := range items { for _, it := range items {
if v := strings.TrimSpace(os.Getenv(it.env)); v != "" { if value := strings.TrimSpace(os.Getenv(it.env)); value != "" {
if q, err := resource.ParseQuantity(v); err == nil { if quantity, err := resource.ParseQuantity(value); err == nil {
(*it.to)[it.rn] = q it.resourceList[it.resourceName] = quantity
} else { } 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{} rr := corev1.ResourceRequirements{}
if len(reqs) > 0 { if len(requests) > 0 {
rr.Requests = reqs rr.Requests = requests
} }
if len(lims) > 0 { if len(limits) > 0 {
rr.Limits = lims rr.Limits = limits
} }
return rr return rr