github/k3k
1
0
Fork 0
mirror of https://github.com/rancher/k3k.git synced 2026-04-22 10:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #623 from bigkevmcd/resource-quantity

Browse Source 
Use resource.Quantity instead of a string for storageRequestSize in the Cluster definition.
This commit is contained in:
Kevin McDermott
2026-01-22 13:13:06 +00:00
committed by GitHub
parent 0cea0c9e14 eaa20c16e7
commit c0418267c9
11 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/cluster/cluster_test.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"time"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,7 +67,7 @@ var _ = Describe("Cluster Controller", Label("controller"), Label("Cluster"), fu
Expect(cluster.Spec.Sync.PriorityClasses.Enabled).To(BeFalse())
Expect(cluster.Spec.Persistence.Type).To(Equal(v1beta1.DynamicPersistenceMode))
Expect(cluster.Spec.Persistence.StorageRequestSize).To(Equal("2G"))
Expect(cluster.Spec.Persistence.StorageRequestSize.Equal(resource.MustParse("2G"))).To(BeTrue())
Expect(cluster.Status.Phase).To(Equal(v1beta1.ClusterUnknown))

3
pkg/controller/cluster/server/server.go
View File

@@ -8,7 +8,6 @@ import (
"strings"
"text/template"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/utils/ptr"
@@ -406,7 +405,7 @@ func (s *Server) setupDynamicPersistence() v1.PersistentVolumeClaim {
StorageClassName: s.cluster.Spec.Persistence.StorageClassName,
Resources: v1.VolumeResourceRequirements{
Requests: v1.ResourceList{
"storage": resource.MustParse(s.cluster.Spec.Persistence.StorageRequestSize),
"storage": *s.cluster.Spec.Persistence.StorageRequestSize,
},
},
},