From 183d615a5dc4da1e95120343d26eb383b0ea93e5 Mon Sep 17 00:00:00 2001 From: Alexandre DEVELY <12896316+alexandredevely@users.noreply.github.com> Date: Mon, 19 Jan 2026 22:34:07 +0100 Subject: [PATCH 1/3] Refactor resource definitions in values.yaml --- charts/abcdesktop/values.yaml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/charts/abcdesktop/values.yaml b/charts/abcdesktop/values.yaml index 5e9b06e..977be29 100644 --- a/charts/abcdesktop/values.yaml +++ b/charts/abcdesktop/values.yaml @@ -657,40 +657,28 @@ od_config: | 'nodeSelector':None, 'description': 'default: up to 4 CPU cores and 8Gi', 'runtimeClassName': None, - 'resources':{ - 'requests':{'memory':"576Mi",'cpu':"220m"}, - 'limits': {'memory':"8Gi",'cpu':"4000m"} - } + 'resources':{ 'requests': {'memory':'576Mi','cpu':"220m"}, 'limits': {'memory':'8Gi','cpu':'4000m'} } }, 'bronze':{ 'nodeSelector':None, 'runtimeClassName': None, 'description': 'bronze: up to 2 CPU cores and 8Gi', - 'resources':{ - 'requests':{'memory':"576Mi",'cpu':"220m"}, - 'limits': {'memory':"8Gi",'cpu':"2000m"} - } + 'resources':{ 'requests':{'memory':'576Mi','cpu':'220m'}, 'limits': {'memory':'8Gi','cpu':'2000m'} } }, 'silver':{ 'nodeSelector': None, 'description': 'silver: 4 CPU cores and 32Gi RAM', 'runtimeClassName': None, - 'resources':{ - 'requests':{'memory':"2Gi",'cpu':"2000m"}, - 'limits':{'memory':"32Gi",'cpu':"4000m"} - } - }, + 'resources':{ 'requests':{'memory':'2Gi','cpu':'2000m'}, 'limits':{'memory':'32Gi','cpu':'4000m'} } + }, 'gold':{ # to give a gpu to graphical container, add 'containers' entry 'containers' : { 'graphical': { 'resources': { 'limits': { 'nvidia.com/gpu':'1' } } } }, 'nodeSelector':{'nvidia.com/gpu.present': 'true'}, 'description': 'gold: 4 CPU cores, 32Gi RAM and 1 GPU', 'runtimeClassName': 'nvidia', - 'resources':{ - 'requests':{'memory':"2Gi",'cpu':"4000m"}, - 'limits': {'memory':"32Gi",'cpu':"4000m"} - } - }, + 'resources':{ 'requests':{'memory':'2Gi','cpu':'4000m'}, 'limits': {'memory':'32Gi','cpu':'4000m'} } + }, 'platinum':{ # to give a gpu to graphical container, add 'containers' entry 'containers' : { 'graphical': { 'resources': { 'limits': { 'nvidia.com/gpu':'1' } } } }, @@ -699,9 +687,7 @@ od_config: | # this appears only on web interface 'description': 'platinum: 8 CPU cores, 128G RAM and 1 GPU', 'runtimeClassName': 'nvidia', - 'resources':{ - 'requests':{'memory':"4Gi",'cpu':"4000m"}, - 'limits':{'memory':"128Gi",'cpu':"8000m"} } } } + 'resources':{ 'requests':{'memory':'4Gi','cpu':'4000m'}, 'limits':{'memory':'128Gi','cpu':'8000m' } } } } # features_permissions # read executeclasses and permit a user to set a dedicated class name as desktop features From d1d6d30d3158759cafc14628eb029606656785cf Mon Sep 17 00:00:00 2001 From: Alexandre DEVELY <12896316+alexandredevely@users.noreply.github.com> Date: Mon, 19 Jan 2026 22:45:34 +0100 Subject: [PATCH 2/3] m fix resources --- charts/abcdesktop/values.yaml | 71 ++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/charts/abcdesktop/values.yaml b/charts/abcdesktop/values.yaml index 977be29..085e6a4 100644 --- a/charts/abcdesktop/values.yaml +++ b/charts/abcdesktop/values.yaml @@ -652,42 +652,42 @@ od_config: | K8S_CREATE_EPHEMERALCONTAINER_TIMEOUT_SECONDS: 120 # END OF K8S TIMEOUT + # + # Application execute class defined + # define some executeclasses name with + # resources requests and limits value + # then map executeclasses to application executeclasses : { - 'default':{ - 'nodeSelector':None, - 'description': 'default: up to 4 CPU cores and 8Gi', - 'runtimeClassName': None, - 'resources':{ 'requests': {'memory':'576Mi','cpu':"220m"}, 'limits': {'memory':'8Gi','cpu':'4000m'} } - }, - 'bronze':{ - 'nodeSelector':None, - 'runtimeClassName': None, - 'description': 'bronze: up to 2 CPU cores and 8Gi', - 'resources':{ 'requests':{'memory':'576Mi','cpu':'220m'}, 'limits': {'memory':'8Gi','cpu':'2000m'} } - }, - 'silver':{ - 'nodeSelector': None, - 'description': 'silver: 4 CPU cores and 32Gi RAM', - 'runtimeClassName': None, - 'resources':{ 'requests':{'memory':'2Gi','cpu':'2000m'}, 'limits':{'memory':'32Gi','cpu':'4000m'} } - }, - 'gold':{ - # to give a gpu to graphical container, add 'containers' entry - 'containers' : { 'graphical': { 'resources': { 'limits': { 'nvidia.com/gpu':'1' } } } }, - 'nodeSelector':{'nvidia.com/gpu.present': 'true'}, - 'description': 'gold: 4 CPU cores, 32Gi RAM and 1 GPU', - 'runtimeClassName': 'nvidia', - 'resources':{ 'requests':{'memory':'2Gi','cpu':'4000m'}, 'limits': {'memory':'32Gi','cpu':'4000m'} } - }, - 'platinum':{ - # to give a gpu to graphical container, add 'containers' entry - 'containers' : { 'graphical': { 'resources': { 'limits': { 'nvidia.com/gpu':'1' } } } }, - # nodeselector optional - 'nodeSelector':{'nvidia.com/gpu.present': 'true'}, - # this appears only on web interface - 'description': 'platinum: 8 CPU cores, 128G RAM and 1 GPU', - 'runtimeClassName': 'nvidia', - 'resources':{ 'requests':{'memory':'4Gi','cpu':'4000m'}, 'limits':{'memory':'128Gi','cpu':'8000m' } } } } + 'default':{ + 'description': 'default: 1 CPU cores and 2Gi', + 'nodeSelector':None, + 'resources':{ + 'requests':{'memory':"512Mi",'cpu':"100m"}, + 'limits': {'memory':"2Gi",'cpu':"1000m"} + } + }, + 'bronze':{ + 'description': 'bronze: 1 core / 2 Gi / 0 GPU', + 'nodeSelector':None, + 'resources':{ + 'requests':{'memory':"64Mi",'cpu':"100m"}, + 'limits': {'memory':"2Gi",'cpu':"1000m"} + } + }, + 'silver':{ + 'description': 'silver: 2 cores / 4 Gi / 1 GPU', + 'nodeSelector':None, + 'resources':{ + 'requests':{'memory':"64Mi",'cpu':"100m"}, + 'limits': {'memory':"4Gi",'cpu':"2000m", 'nvidia.com/gpu':'1' } + } + }, + 'gold':{ + 'description': 'gold: 4 cores / 8 Gi / 1 GPU', + 'nodeSelector':None, + 'resources':{ + 'requests':{'memory':"128Mi",'cpu':"100m"}, + 'limits':{'memory':"8Gi",'cpu':"4000m", 'nvidia.com/gpu':'1' } } } } # features_permissions # read executeclasses and permit a user to set a dedicated class name as desktop features @@ -824,6 +824,7 @@ od_config: | 'enable': True, 'tcpport': 29788, 'acl': { 'permit': [ 'all' ] } + } }, # container init # a simple busybox to chowner and chmod of homedir From 3f0e9bee3e563a9fecb478f8516ec53bb590549e Mon Sep 17 00:00:00 2001 From: Alexandre DEVELY <12896316+alexandredevely@users.noreply.github.com> Date: Mon, 19 Jan 2026 22:53:59 +0100 Subject: [PATCH 3/3] fix bad json format --- charts/abcdesktop/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/abcdesktop/values.yaml b/charts/abcdesktop/values.yaml index 085e6a4..5120300 100644 --- a/charts/abcdesktop/values.yaml +++ b/charts/abcdesktop/values.yaml @@ -824,7 +824,6 @@ od_config: | 'enable': True, 'tcpport': 29788, 'acl': { 'permit': [ 'all' ] } - } }, # container init # a simple busybox to chowner and chmod of homedir