Merge pull request #28969 from guillermodotn/main

kube: fix quantityToInt64 dropping scale for fractional BinarySI

Author: danishprakash

pkg/specgen/generate/kube/kube.go

@@ -294,10 +294,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
 	// but apply to the containers with the prefixed name
 	s.SeccompProfilePath = opts.SeccompPaths.FindForContainer(opts.Container.Name)
 
-	err = setupContainerResources(s, opts.Container)
-	if err != nil {
-		return nil, fmt.Errorf("failed to configure container resources: %w", err)
-	}
+	setupContainerResources(s, opts.Container)
 
 	err = setupContainerDevices(s, opts.Container)
 	if err != nil {
@@ -881,7 +878,7 @@ func makeHealthCheck(inCmd string, interval int32, retries int32, timeout int32,
 	return &hc, nil
 }
 
-func setupContainerResources(s *specgen.SpecGenerator, containerYAML v1.Container) error {
+func setupContainerResources(s *specgen.SpecGenerator, containerYAML v1.Container) {
 	s.ResourceLimits = &spec.LinuxResources{}
 	milliCPU := containerYAML.Resources.Limits.Cpu().MilliValue()
 	if milliCPU > 0 {
@@ -892,15 +889,9 @@ func setupContainerResources(s *specgen.SpecGenerator, containerYAML v1.Containe
 		}
 	}
 
-	limit, err := quantityToInt64(containerYAML.Resources.Limits.Memory())
-	if err != nil {
-		return fmt.Errorf("failed to set memory limit: %w", err)
-	}
+	limit := quantityToInt64(containerYAML.Resources.Limits.Memory())
 
-	memoryRes, err := quantityToInt64(containerYAML.Resources.Requests.Memory())
-	if err != nil {
-		return fmt.Errorf("failed to set memory reservation: %w", err)
-	}
+	memoryRes := quantityToInt64(containerYAML.Resources.Requests.Memory())
 
 	if limit > 0 || memoryRes > 0 {
 		s.ResourceLimits.Memory = &spec.LinuxMemory{}
@@ -913,8 +904,6 @@ func setupContainerResources(s *specgen.SpecGenerator, containerYAML v1.Containe
 	if memoryRes > 0 {
 		s.ResourceLimits.Memory.Reservation = &memoryRes
 	}
-
-	return nil
 }
 
 const PodmanDeviceResourcePrefix = "io.podman/device"
@@ -1036,16 +1025,14 @@ func setupSecurityContext(s *specgen.SpecGenerator, securityContext *v1.Security
 	}
 }
 
-func quantityToInt64(quantity *resource.Quantity) (int64, error) {
+func quantityToInt64(quantity *resource.Quantity) int64 {
 	if i, ok := quantity.AsInt64(); ok {
-		return i, nil
-	}
-
-	if i, ok := quantity.AsDec().Unscaled(); ok {
-		return i, nil
+		return i
 	}
 
-	return 0, fmt.Errorf("quantity cannot be represented as int64: %v", quantity)
+	// Value() properly accounts for the decimal scale, unlike
+	// AsDec().Unscaled() which silently drops it.
+	return quantity.Value()
 }
 
 // read a k8s secret in JSON/YAML format from the secret manager

pkg/specgen/generate/kube/kube_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1"
+	"go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource"
 	"go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr"
 )
 
@@ -137,3 +138,45 @@ func TestGetPortNumber(t *testing.T) {
 	assert.NoError(t, e)
 	assert.Equal(t, i, 6000)
 }
+
+func TestQuantityToInt64(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected int64
+	}{
+		{
+			name:     "integer BinarySI",
+			input:    "1536Mi",
+			expected: 1536 * 1024 * 1024,
+		},
+		{
+			name:     "fractional BinarySI",
+			input:    "1.5Gi",
+			expected: 1536 * 1024 * 1024,
+		},
+		{
+			name:     "larger fractional BinarySI",
+			input:    "2.5Gi",
+			expected: 2560 * 1024 * 1024,
+		},
+		{
+			name:     "fractional DecimalSI",
+			input:    "1.5G",
+			expected: 1500000000,
+		},
+		{
+			name:     "zero",
+			input:    "0",
+			expected: 0,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			q := resource.MustParse(tt.input)
+			got := quantityToInt64(&q)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}

test/e2e/play_kube_test.go

@@ -4274,6 +4274,28 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`)
 		Expect(inspect.OutputToString()).To(ContainSubstring("Memory: " + expectedMemoryLimit))
 	})
 
+	It("allows setting fractional BinarySI memory limits", func() {
+		SkipIfContainerized("Resource limits require a running systemd")
+		podmanTest.CgroupManager = "systemd"
+
+		pod := getPod(withCtr(getCtr(
+			withMemoryLimit("1.5Gi"),
+			withMemoryRequest("1.5Gi"),
+		)))
+		err := generateKubeYaml("pod", pod, kubeYaml)
+		Expect(err).ToNot(HaveOccurred())
+
+		kube := podmanTest.Podman([]string{"kube", "play", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube).Should(Exit(0))
+
+		inspect := podmanTest.PodmanExitCleanly("inspect", getCtrNameInPod(pod), "--format", `
+Memory: {{ .HostConfig.Memory }}
+MemoryReservation: {{ .HostConfig.MemoryReservation }}`)
+		Expect(inspect.OutputToString()).To(ContainSubstring("Memory: 1610612736"))
+		Expect(inspect.OutputToString()).To(ContainSubstring("MemoryReservation: 1610612736"))
+	})
+
 	It("allows setting resource limits with --cpus 1", func() {
 		SkipIfContainerized("Resource limits require a running systemd")
 		SkipIfRootless("CPU limits require root")