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

Merge pull request #1865 from sosan/fix-dependencies

Browse Source 
update dependencies to last version and go 1.22
This commit is contained in:
Kubernetes Prow Robot
2024-04-25 15:40:08 -07:00
committed by GitHub
parent c7e783e87d 840cfa657d
commit 0ba68fb88d
4 changed files with 227 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/loader/compose/compose.go
+4 -12
View File
@@ -653,23 +653,15 @@ func parseResources(composeServiceConfig *types.ServiceConfig, serviceConfig *ko
if composeServiceConfig.Deploy.Resources.Limits != nil {
serviceConfig.MemLimit = composeServiceConfig.Deploy.Resources.Limits.MemoryBytes
if composeServiceConfig.Deploy.Resources.Limits.NanoCPUs != "" {
cpuLimit, err := strconv.ParseFloat(composeServiceConfig.Deploy.Resources.Limits.NanoCPUs, 64)
if err != nil {
return errors.Wrap(err, "Unable to convert cpu limits resources value")
}
serviceConfig.CPULimit = int64(cpuLimit * 1000)
if composeServiceConfig.Deploy.Resources.Limits.NanoCPUs > 0 {
serviceConfig.CPULimit = int64(composeServiceConfig.Deploy.Resources.Limits.NanoCPUs * 1000)
}
}
if composeServiceConfig.Deploy.Resources.Reservations != nil {
serviceConfig.MemReservation = composeServiceConfig.Deploy.Resources.Reservations.MemoryBytes
if composeServiceConfig.Deploy.Resources.Reservations.NanoCPUs != "" {
cpuReservation, err := strconv.ParseFloat(composeServiceConfig.Deploy.Resources.Reservations.NanoCPUs, 64)
if err != nil {
return errors.Wrap(err, "Unable to convert cpu limits reservation value")
}
serviceConfig.CPUReservation = int64(cpuReservation * 1000)
if composeServiceConfig.Deploy.Resources.Reservations.NanoCPUs > 0 {
serviceConfig.CPUReservation = int64(composeServiceConfig.Deploy.Resources.Reservations.NanoCPUs * 1000)
}
}
}
pkg/transformer/kubernetes/kubernetes.go
+1 -1
View File
@@ -621,7 +621,7 @@ func (k *Kubernetes) CreatePVC(name string, mode string, size string, selectorVa
Labels: transformer.ConfigLabels(name),
},
Spec: api.PersistentVolumeClaimSpec{
Resources: api.ResourceRequirements{
Resources: api.VolumeResourceRequirements{
Requests: api.ResourceList{
api.ResourceStorage: volSize,
},