deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

refactor: changed the deploy label to use the convention

Browse Source
This commit is contained in:
João Vitor Paes de Barros do Carmo 2024-10-04 00:06:43 +01:00
parent 3ec739017d
commit 1c7c63f1e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/transformer/kubernetes/k8sutils.go
View File

@ -811,7 +811,7 @@ func KomposeObjectToServiceConfigGroupMapping(komposeObject *kobject.KomposeObje
// TranslatePodResource config pod resources // TranslatePodResource config pod resources
func TranslatePodResource(service *kobject.ServiceConfig, template *api.PodTemplateSpec) { func TranslatePodResource(service *kobject.ServiceConfig, template *api.PodTemplateSpec) {
// Configure the resource limits // Configure the resource limits
if service.MemLimit != 0 || service.CPULimit != 0 || service.DeployLabels["limits.ephemeral-storage"] != "" { if service.MemLimit != 0 || service.CPULimit != 0 || service.DeployLabels["kompose.ephemeral-storage.limit"] != "" {
resourceLimit := api.ResourceList{} resourceLimit := api.ResourceList{}
if service.MemLimit != 0 { if service.MemLimit != 0 {
@ -823,7 +823,7 @@ func TranslatePodResource(service *kobject.ServiceConfig, template *api.PodTempl
} }
// Check for ephemeral-storage in deploy labels // Check for ephemeral-storage in deploy labels
if val, ok := service.DeployLabels["limits.ephemeral-storage"]; ok { if val, ok := service.DeployLabels["kompose.ephemeral-storage.limit"]; ok {
if quantity, err := resource.ParseQuantity(val); err == nil { if quantity, err := resource.ParseQuantity(val); err == nil {
resourceLimit[api.ResourceEphemeralStorage] = quantity resourceLimit[api.ResourceEphemeralStorage] = quantity
} }
@ -833,7 +833,7 @@ func TranslatePodResource(service *kobject.ServiceConfig, template *api.PodTempl
} }
// Configure the resource requests // Configure the resource requests
if service.MemReservation != 0 || service.CPUReservation != 0 || service.DeployLabels["requests.ephemeral-storage"] != "" { if service.MemReservation != 0 || service.CPUReservation != 0 || service.DeployLabels["kompose.ephemeral-storage.request"] != "" {
resourceRequests := api.ResourceList{} resourceRequests := api.ResourceList{}
if service.MemReservation != 0 { if service.MemReservation != 0 {
@ -845,7 +845,7 @@ func TranslatePodResource(service *kobject.ServiceConfig, template *api.PodTempl
} }
// Check for ephemeral-storage in deploy labels // Check for ephemeral-storage in deploy labels
if val, ok := service.DeployLabels["requests.ephemeral-storage"]; ok { if val, ok := service.DeployLabels["kompose.ephemeral-storage.request"]; ok {
if quantity, err := resource.ParseQuantity(val); err == nil { if quantity, err := resource.ParseQuantity(val); err == nil {
resourceRequests[api.ResourceEphemeralStorage] = quantity resourceRequests[api.ResourceEphemeralStorage] = quantity
} }

4
script/test/fixtures/deploy/labels/compose.yaml vendored
View File

@ -5,5 +5,5 @@ services:
- 3000:3000 - 3000:3000
deploy: deploy:
labels: labels:
requests.ephemeral-storage: 1Gi kompose.ephemeral-storage.request: 1Gi
limits.ephemeral-storage: 1Gi kompose.ephemeral-storage.limit: 1Gi