Skip to content

Commit cbda507

Browse files
sjenningsjenning
authored
Merge pull request #5965 from bryan-cox/OCPBUGS-54439
OCPBUGS-54439: Change KASGoMemLimit to a string pointer type
2 parents 98c1c57 + 5496ce6 commit cbda507

File tree

11 files changed

+38
-49
lines changed

11 files changed

+38
-49
lines changed

‎api/scheduling/v1alpha1/clustersizingconfiguration_types.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,13 @@ type NodeCountCriteria struct {
109109
type Effects struct {
110110

111111
// +kubebuilder:validation:Optional
112+
// +kubebuilder:validation:Pattern=`^\d+(B|KiB|MiB|GiB|TiB)?$`
113+
// +kubebuilder:validation:MaxLength=20
112114

113115
// KASGoMemLimit is the value to set for the $GOMEMLIMIT of the Kube APIServer container
114-
KASGoMemLimit *resource.Quantity `json:"kasGoMemLimit,omitempty"`
116+
// Expected format is a number followed by a unit (B, KiB, MiB, GiB, TiB). See the Go runtime library for more
117+
// information on the format - https://pkg.go.dev/runtime#hdr-Environment_Variables.
118+
KASGoMemLimit *string `json:"kasGoMemLimit,omitempty"`
115119

116120
// +kubebuilder:validation:Optional
117121

‎api/scheduling/v1alpha1/zz_generated.deepcopy.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/applyconfiguration/scheduling/v1alpha1/effects.go

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/install/assets/hypershift-operator/scheduling.hypershift.openshift.io_clustersizingconfigurations.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ spec:
132132
to use for etcd pods
133133
type: string
134134
kasGoMemLimit:
135-
anyOf:
136-
- type: integer
137-
- type: string
138-
description: KASGoMemLimit is the value to set for the $GOMEMLIMIT
139-
of the Kube APIServer container
140-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
141-
x-kubernetes-int-or-string: true
135+
description: |-
136+
KASGoMemLimit is the value to set for the $GOMEMLIMIT of the Kube APIServer container
137+
Expected format is a number followed by a unit (B, KiB, MiB, GiB, TiB). See the Go runtime library for more
138+
information on the format - https://pkg.go.dev/runtime#hdr-Environment_Variables.
139+
maxLength: 20
140+
pattern: ^\d+(B|KiB|MiB|GiB|TiB)?$
141+
type: string
142142
machineHealthCheckTimeout:
143143
description: |-
144144
MachineHealthCheckTimeout specifies an optional timeout for machinehealthchecks created

‎control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5737,7 +5737,7 @@ func setKASCustomKubeconfigStatus(ctx context.Context, hcp *hyperv1.HostedContro
57375737
Key: DefaultAdminKubeconfigKey,
57385738
}
57395739
} else {
5740-
// Cleanning up custom kubeconfig status
5740+
// Cleaning up custom kubeconfig status
57415741
hcp.Status.CustomKubeconfig = nil
57425742
}
57435743

‎hypershift-operator/controllers/scheduler/aws/dedicated_request_serving_nodes_test.go

+5-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
appsv1 "k8s.io/api/apps/v1"
1616
corev1 "k8s.io/api/core/v1"
1717
apierrors "k8s.io/apimachinery/pkg/api/errors"
18-
"k8s.io/apimachinery/pkg/api/resource"
1918
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2019
"k8s.io/apimachinery/pkg/types"
2120
"k8s.io/utils/ptr"
@@ -291,15 +290,6 @@ func TestHostedClusterScheduler(t *testing.T) {
291290
}
292291

293292
func TestHostedClusterSchedulerAndSizer(t *testing.T) {
294-
295-
mustQty := func(qty string) *resource.Quantity {
296-
result, err := resource.ParseQuantity(qty)
297-
if err != nil {
298-
panic(err)
299-
}
300-
return &result
301-
}
302-
303293
sizingConfig := &schedulingv1alpha1.ClusterSizingConfiguration{
304294
ObjectMeta: metav1.ObjectMeta{
305295
Name: "cluster",
@@ -316,7 +306,7 @@ func TestHostedClusterSchedulerAndSizer(t *testing.T) {
316306
Placeholders: 2,
317307
},
318308
Effects: &schedulingv1alpha1.Effects{
319-
KASGoMemLimit: mustQty("1Gi"),
309+
KASGoMemLimit: ptr.To("1GiB"),
320310
},
321311
},
322312
{
@@ -326,7 +316,7 @@ func TestHostedClusterSchedulerAndSizer(t *testing.T) {
326316
To: ptr.To(uint32(2)),
327317
},
328318
Effects: &schedulingv1alpha1.Effects{
329-
KASGoMemLimit: mustQty("2Gi"),
319+
KASGoMemLimit: ptr.To("2GiB"),
330320
},
331321
},
332322
{
@@ -336,7 +326,7 @@ func TestHostedClusterSchedulerAndSizer(t *testing.T) {
336326
To: nil,
337327
},
338328
Effects: &schedulingv1alpha1.Effects{
339-
KASGoMemLimit: mustQty("3Gi"),
329+
KASGoMemLimit: ptr.To("3GiB"),
340330
},
341331
},
342332
},
@@ -382,7 +372,7 @@ func TestHostedClusterSchedulerAndSizer(t *testing.T) {
382372
hc.Annotations[hyperv1.RequestServingNodeAdditionalSelectorAnnotation] = fmt.Sprintf("%s=%s", hyperv1.NodeSizeLabel, sizeLabel)
383373
for _, sizeCfg := range sizingConfig.Spec.Sizes {
384374
if sizeCfg.Name == sizeLabel {
385-
hc.Annotations[hyperv1.KubeAPIServerGOMemoryLimitAnnotation] = sizeCfg.Effects.KASGoMemLimit.String()
375+
hc.Annotations[hyperv1.KubeAPIServerGOMemoryLimitAnnotation] = ptr.Deref(sizeCfg.Effects.KASGoMemLimit, "")
386376
break
387377
}
388378
}
@@ -641,7 +631,7 @@ func TestHostedClusterSchedulerAndSizer(t *testing.T) {
641631
g.Expect(actual.Annotations[hyperv1.RequestServingNodeAdditionalSelectorAnnotation]).To(Equal(fmt.Sprintf("%s=%s", hyperv1.NodeSizeLabel, sizeLabel)))
642632
for _, sizeCfg := range sizingConfig.Spec.Sizes {
643633
if sizeCfg.Name == sizeLabel {
644-
g.Expect(actual.Annotations[hyperv1.KubeAPIServerGOMemoryLimitAnnotation]).To(Equal(sizeCfg.Effects.KASGoMemLimit.String()))
634+
g.Expect(actual.Annotations[hyperv1.KubeAPIServerGOMemoryLimitAnnotation]).To(Equal(ptr.Deref(sizeCfg.Effects.KASGoMemLimit, "")))
645635
break
646636
}
647637
}

‎hypershift-operator/controllers/scheduler/azure/controllers_test.go

+4-13
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
schedulingv1alpha1 "github.com/openshift/hypershift/api/scheduling/v1alpha1"
1212
hyperapi "github.com/openshift/hypershift/support/api"
1313

14-
"k8s.io/apimachinery/pkg/api/resource"
1514
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1615
"k8s.io/utils/ptr"
1716

@@ -21,14 +20,6 @@ import (
2120
)
2221

2322
func TestReconcile(t *testing.T) {
24-
mustQty := func(qty string) *resource.Quantity {
25-
result, err := resource.ParseQuantity(qty)
26-
if err != nil {
27-
panic(err)
28-
}
29-
return &result
30-
}
31-
3223
sizingConfig := &schedulingv1alpha1.ClusterSizingConfiguration{
3324
ObjectMeta: metav1.ObjectMeta{
3425
Name: "cluster",
@@ -42,7 +33,7 @@ func TestReconcile(t *testing.T) {
4233
To: ptr.To(uint32(1)),
4334
},
4435
Effects: &schedulingv1alpha1.Effects{
45-
KASGoMemLimit: mustQty("1Gi"),
36+
KASGoMemLimit: ptr.To("1GiB"),
4637
},
4738
},
4839
{
@@ -52,7 +43,7 @@ func TestReconcile(t *testing.T) {
5243
To: ptr.To(uint32(2)),
5344
},
5445
Effects: &schedulingv1alpha1.Effects{
55-
KASGoMemLimit: mustQty("2Gi"),
46+
KASGoMemLimit: ptr.To("2GiB"),
5647
},
5748
},
5849
{
@@ -62,7 +53,7 @@ func TestReconcile(t *testing.T) {
6253
To: nil,
6354
},
6455
Effects: &schedulingv1alpha1.Effects{
65-
KASGoMemLimit: mustQty("3Gi"),
56+
KASGoMemLimit: ptr.To("3GiB"),
6657
},
6758
},
6859
},
@@ -163,7 +154,7 @@ func TestReconcile(t *testing.T) {
163154
expectError: false,
164155
expectRequeue: false,
165156
expectAnnotations: map[string]string{
166-
hyperv1.KubeAPIServerGOMemoryLimitAnnotation: "1Gi",
157+
hyperv1.KubeAPIServerGOMemoryLimitAnnotation: "1GiB",
167158
},
168159
},
169160
}

‎hypershift-operator/controllers/scheduler/util/scheduler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
corev1 "k8s.io/api/core/v1"
1212
"k8s.io/apimachinery/pkg/api/equality"
13+
"k8s.io/utils/ptr"
1314

1415
"sigs.k8s.io/controller-runtime/pkg/client"
1516
)
@@ -37,7 +38,7 @@ func setHostedClusterSchedulingAnnotations(hc *hyperv1.HostedCluster, size strin
3738

3839
goMemLimit := ""
3940
if sizeConfig.Effects != nil && sizeConfig.Effects.KASGoMemLimit != nil {
40-
goMemLimit = sizeConfig.Effects.KASGoMemLimit.String()
41+
goMemLimit = ptr.Deref(sizeConfig.Effects.KASGoMemLimit, "")
4142
}
4243

4344
// For AWS try and get the goMem limit from the nodes

‎hypershift-operator/controllers/scheduler/util/scheduler_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestSetHostedClusterSchedulingAnnotations(t *testing.T) {
4848
{
4949
Name: "medium",
5050
Effects: &schedulingv1alpha1.Effects{
51-
KASGoMemLimit: resource.NewQuantity(1024, resource.BinarySI),
51+
KASGoMemLimit: ptr.To("1KiB"),
5252
},
5353
},
5454
},
@@ -59,7 +59,7 @@ func TestSetHostedClusterSchedulingAnnotations(t *testing.T) {
5959
ObjectMeta: metav1.ObjectMeta{
6060
Annotations: map[string]string{
6161
hyperv1.HostedClusterScheduledAnnotation: "true",
62-
hyperv1.KubeAPIServerGOMemoryLimitAnnotation: "1Ki",
62+
hyperv1.KubeAPIServerGOMemoryLimitAnnotation: "1KiB",
6363
},
6464
},
6565
},
@@ -79,7 +79,7 @@ func TestSetHostedClusterSchedulingAnnotations(t *testing.T) {
7979
{
8080
Name: "large",
8181
Effects: &schedulingv1alpha1.Effects{
82-
KASGoMemLimit: resource.NewQuantity(2048, resource.BinarySI),
82+
KASGoMemLimit: ptr.To("2048MiB"),
8383
},
8484
},
8585
},

‎vendor/github.com/openshift/hypershift/api/scheduling/v1alpha1/clustersizingconfiguration_types.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/hypershift/api/scheduling/v1alpha1/zz_generated.deepcopy.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)