hugepages empty on default and updated date in codegen files (#2512)

* hugepages empty on default using string pointer and updated date of codegen files

Author: FxKu

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -153,10 +153,10 @@ type PostgresqlParam struct {
 
 // ResourceDescription describes CPU and memory resources defined for a cluster.
 type ResourceDescription struct {
-	CPU          string `json:"cpu"`
-	Memory       string `json:"memory"`
-	HugePages2Mi string `json:"hugepages-2Mi"`
-	HugePages1Gi string `json:"hugepages-1Gi"`
+	CPU          string  `json:"cpu"`
+	Memory       string  `json:"memory"`
+	HugePages2Mi *string `json:"hugepages-2Mi"`
+	HugePages1Gi *string `json:"hugepages-1Gi"`
 }
 
 // Resources describes requests and limits for the cluster resouces.

pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go

@@ -267,14 +267,14 @@ func fillResourceList(spec acidv1.ResourceDescription, defaults acidv1.ResourceD
 		}
 	}
 
-	if spec.HugePages2Mi != "" {
-		requests[v1.ResourceHugePagesPrefix+"2Mi"], err = resource.ParseQuantity(spec.HugePages2Mi)
+	if spec.HugePages2Mi != nil {
+		requests[v1.ResourceHugePagesPrefix+"2Mi"], err = resource.ParseQuantity(*spec.HugePages2Mi)
 		if err != nil {
 			return nil, fmt.Errorf("could not parse hugepages-2Mi quantity: %v", err)
 		}
 	}
-	if spec.HugePages1Gi != "" {
-		requests[v1.ResourceHugePagesPrefix+"1Gi"], err = resource.ParseQuantity(spec.HugePages1Gi)
+	if spec.HugePages1Gi != nil {
+		requests[v1.ResourceHugePagesPrefix+"1Gi"], err = resource.ParseQuantity(*spec.HugePages1Gi)
 		if err != nil {
 			return nil, fmt.Errorf("could not parse hugepages-1Gi quantity: %v", err)
 		}

pkg/cluster/k8sres.go

@@ -3127,12 +3127,12 @@ func TestGenerateResourceRequirements(t *testing.T) {
 				Spec: acidv1.PostgresSpec{
 					Resources: &acidv1.Resources{
 						ResourceRequests: acidv1.ResourceDescription{
-							HugePages2Mi: "128Mi",
-							HugePages1Gi: "1Gi",
+							HugePages2Mi: k8sutil.StringToPointer("128Mi"),
+							HugePages1Gi: k8sutil.StringToPointer("1Gi"),
 						},
 						ResourceLimits: acidv1.ResourceDescription{
-							HugePages2Mi: "256Mi",
-							HugePages1Gi: "2Gi",
+							HugePages2Mi: k8sutil.StringToPointer("256Mi"),
+							HugePages1Gi: k8sutil.StringToPointer("2Gi"),
 						},
 					},
 					TeamID: "acid",
@@ -3145,14 +3145,14 @@ func TestGenerateResourceRequirements(t *testing.T) {
 				ResourceRequests: acidv1.ResourceDescription{
 					CPU:          "100m",
 					Memory:       "100Mi",
-					HugePages2Mi: "128Mi",
-					HugePages1Gi: "1Gi",
+					HugePages2Mi: k8sutil.StringToPointer("128Mi"),
+					HugePages1Gi: k8sutil.StringToPointer("1Gi"),
 				},
 				ResourceLimits: acidv1.ResourceDescription{
 					CPU:          "1",
 					Memory:       "500Mi",
-					HugePages2Mi: "256Mi",
-					HugePages1Gi: "2Gi",
+					HugePages2Mi: k8sutil.StringToPointer("256Mi"),
+					HugePages1Gi: k8sutil.StringToPointer("2Gi"),
 				},
 			},
 		},
@@ -3174,12 +3174,12 @@ func TestGenerateResourceRequirements(t *testing.T) {
 							DockerImage: "test-image",
 							Resources: &acidv1.Resources{
 								ResourceRequests: acidv1.ResourceDescription{
-									HugePages2Mi: "128Mi",
-									HugePages1Gi: "1Gi",
+									HugePages2Mi: k8sutil.StringToPointer("128Mi"),
+									HugePages1Gi: k8sutil.StringToPointer("1Gi"),
 								},
 								ResourceLimits: acidv1.ResourceDescription{
-									HugePages2Mi: "256Mi",
-									HugePages1Gi: "2Gi",
+									HugePages2Mi: k8sutil.StringToPointer("256Mi"),
+									HugePages1Gi: k8sutil.StringToPointer("2Gi"),
 								},
 							},
 						},
@@ -3194,14 +3194,14 @@ func TestGenerateResourceRequirements(t *testing.T) {
 				ResourceRequests: acidv1.ResourceDescription{
 					CPU:          "100m",
 					Memory:       "100Mi",
-					HugePages2Mi: "128Mi",
-					HugePages1Gi: "1Gi",
+					HugePages2Mi: k8sutil.StringToPointer("128Mi"),
+					HugePages1Gi: k8sutil.StringToPointer("1Gi"),
 				},
 				ResourceLimits: acidv1.ResourceDescription{
 					CPU:          "1",
 					Memory:       "500Mi",
-					HugePages2Mi: "256Mi",
-					HugePages1Gi: "2Gi",
+					HugePages2Mi: k8sutil.StringToPointer("256Mi"),
+					HugePages1Gi: k8sutil.StringToPointer("2Gi"),
 				},
 			},
 		},