Skip to content

Commit 4c66368

Browse files
Colvin-YColvin-Y
authored
chore: change sidecarset container resourcesPolicy subfiled api name (#2244)
Signed-off-by: Colvin-Y <[email protected]>
1 parent d5c13a5 commit 4c66368

15 files changed

+274
-274
lines changed

‎apis/apps/v1alpha1/conversion_test.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,9 +2173,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
21732173
Image: "sidecar:latest",
21742174
},
21752175
ResourcesPolicy: &ResourcesPolicy{
2176-
TargetContainerMode: TargetContainerModeSum,
2176+
TargetContainersMode: TargetContainersModeSum,
21772177
TargetContainersNameRegex: "^large-engine-v.*$",
2178-
ResourceExpr: ResourceExpr{
2178+
ResourcesExpr: ResourcesExpr{
21792179
Limits: &ResourceExprLimits{
21802180
CPU: "max(cpu*50%, 50m)",
21812181
Memory: "200Mi",
@@ -2205,9 +2205,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
22052205
Image: "sidecar:latest",
22062206
},
22072207
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2208-
TargetContainerMode: v1beta1.TargetContainerModeSum,
2208+
TargetContainersMode: v1beta1.TargetContainersModeSum,
22092209
TargetContainersNameRegex: "^large-engine-v.*$",
2210-
ResourceExpr: v1beta1.ResourceExpr{
2210+
ResourcesExpr: v1beta1.ResourcesExpr{
22112211
Limits: &v1beta1.ResourceExprLimits{
22122212
CPU: "max(cpu*50%, 50m)",
22132213
Memory: "200Mi",
@@ -2240,9 +2240,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
22402240
Image: "sidecar:latest",
22412241
},
22422242
ResourcesPolicy: &ResourcesPolicy{
2243-
TargetContainerMode: TargetContainerModeMax,
2243+
TargetContainersMode: TargetContainersModeMax,
22442244
TargetContainersNameRegex: ".*",
2245-
ResourceExpr: ResourceExpr{
2245+
ResourcesExpr: ResourcesExpr{
22462246
Limits: &ResourceExprLimits{
22472247
CPU: "cpu*30%",
22482248
Memory: "memory*25%",
@@ -2272,9 +2272,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
22722272
Image: "sidecar:latest",
22732273
},
22742274
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2275-
TargetContainerMode: v1beta1.TargetContainerModeMax,
2275+
TargetContainersMode: v1beta1.TargetContainersModeMax,
22762276
TargetContainersNameRegex: ".*",
2277-
ResourceExpr: v1beta1.ResourceExpr{
2277+
ResourcesExpr: v1beta1.ResourcesExpr{
22782278
Limits: &v1beta1.ResourceExprLimits{
22792279
CPU: "cpu*30%",
22802280
Memory: "memory*25%",
@@ -2307,9 +2307,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
23072307
Image: "sidecar:latest",
23082308
},
23092309
ResourcesPolicy: &ResourcesPolicy{
2310-
TargetContainerMode: TargetContainerModeSum,
2310+
TargetContainersMode: TargetContainersModeSum,
23112311
TargetContainersNameRegex: "^app.*$",
2312-
ResourceExpr: ResourceExpr{
2312+
ResourcesExpr: ResourcesExpr{
23132313
Limits: &ResourceExprLimits{
23142314
CPU: "cpu*50% + 100m",
23152315
Memory: "max(memory*20% + 100Mi, 200Mi)",
@@ -2335,9 +2335,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
23352335
Image: "sidecar:latest",
23362336
},
23372337
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2338-
TargetContainerMode: v1beta1.TargetContainerModeSum,
2338+
TargetContainersMode: v1beta1.TargetContainersModeSum,
23392339
TargetContainersNameRegex: "^app.*$",
2340-
ResourceExpr: v1beta1.ResourceExpr{
2340+
ResourcesExpr: v1beta1.ResourcesExpr{
23412341
Limits: &v1beta1.ResourceExprLimits{
23422342
CPU: "cpu*50% + 100m",
23432343
Memory: "max(memory*20% + 100Mi, 200Mi)",
@@ -2366,9 +2366,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
23662366
Image: "sidecar:latest",
23672367
},
23682368
ResourcesPolicy: &ResourcesPolicy{
2369-
TargetContainerMode: TargetContainerModeMax,
2369+
TargetContainersMode: TargetContainersModeMax,
23702370
TargetContainersNameRegex: ".*",
2371-
ResourceExpr: ResourceExpr{
2371+
ResourcesExpr: ResourcesExpr{
23722372
Requests: &ResourceExprRequests{
23732373
CPU: "cpu*30% + 50m",
23742374
Memory: "memory*15% + 50Mi",
@@ -2394,9 +2394,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
23942394
Image: "sidecar:latest",
23952395
},
23962396
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2397-
TargetContainerMode: v1beta1.TargetContainerModeMax,
2397+
TargetContainersMode: v1beta1.TargetContainersModeMax,
23982398
TargetContainersNameRegex: ".*",
2399-
ResourceExpr: v1beta1.ResourceExpr{
2399+
ResourcesExpr: v1beta1.ResourcesExpr{
24002400
Requests: &v1beta1.ResourceExprRequests{
24012401
CPU: "cpu*30% + 50m",
24022402
Memory: "memory*15% + 50Mi",
@@ -2425,9 +2425,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
24252425
Image: "init:latest",
24262426
},
24272427
ResourcesPolicy: &ResourcesPolicy{
2428-
TargetContainerMode: TargetContainerModeSum,
2428+
TargetContainersMode: TargetContainersModeSum,
24292429
TargetContainersNameRegex: "^app.*$",
2430-
ResourceExpr: ResourceExpr{
2430+
ResourcesExpr: ResourcesExpr{
24312431
Limits: &ResourceExprLimits{
24322432
CPU: "max(cpu*30%, 50m)",
24332433
Memory: "max(memory*25%, 100Mi)",
@@ -2457,9 +2457,9 @@ func TestSidecarSet_ConvertTo(t *testing.T) {
24572457
Image: "init:latest",
24582458
},
24592459
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2460-
TargetContainerMode: v1beta1.TargetContainerModeSum,
2460+
TargetContainersMode: v1beta1.TargetContainersModeSum,
24612461
TargetContainersNameRegex: "^app.*$",
2462-
ResourceExpr: v1beta1.ResourceExpr{
2462+
ResourcesExpr: v1beta1.ResourcesExpr{
24632463
Limits: &v1beta1.ResourceExprLimits{
24642464
CPU: "max(cpu*30%, 50m)",
24652465
Memory: "max(memory*25%, 100Mi)",
@@ -2893,9 +2893,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
28932893
Image: "sidecar:latest",
28942894
},
28952895
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2896-
TargetContainerMode: v1beta1.TargetContainerModeSum,
2896+
TargetContainersMode: v1beta1.TargetContainersModeSum,
28972897
TargetContainersNameRegex: "^large-engine-v.*$",
2898-
ResourceExpr: v1beta1.ResourceExpr{
2898+
ResourcesExpr: v1beta1.ResourcesExpr{
28992899
Limits: &v1beta1.ResourceExprLimits{
29002900
CPU: "max(cpu*50%, 50m)",
29012901
Memory: "200Mi",
@@ -2925,9 +2925,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
29252925
Image: "sidecar:latest",
29262926
},
29272927
ResourcesPolicy: &ResourcesPolicy{
2928-
TargetContainerMode: TargetContainerModeSum,
2928+
TargetContainersMode: TargetContainersModeSum,
29292929
TargetContainersNameRegex: "^large-engine-v.*$",
2930-
ResourceExpr: ResourceExpr{
2930+
ResourcesExpr: ResourcesExpr{
29312931
Limits: &ResourceExprLimits{
29322932
CPU: "max(cpu*50%, 50m)",
29332933
Memory: "200Mi",
@@ -2960,9 +2960,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
29602960
Image: "sidecar:latest",
29612961
},
29622962
ResourcesPolicy: &v1beta1.ResourcesPolicy{
2963-
TargetContainerMode: v1beta1.TargetContainerModeMax,
2963+
TargetContainersMode: v1beta1.TargetContainersModeMax,
29642964
TargetContainersNameRegex: ".*",
2965-
ResourceExpr: v1beta1.ResourceExpr{
2965+
ResourcesExpr: v1beta1.ResourcesExpr{
29662966
Limits: &v1beta1.ResourceExprLimits{
29672967
CPU: "cpu*30%",
29682968
Memory: "memory*25%",
@@ -2992,9 +2992,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
29922992
Image: "sidecar:latest",
29932993
},
29942994
ResourcesPolicy: &ResourcesPolicy{
2995-
TargetContainerMode: TargetContainerModeMax,
2995+
TargetContainersMode: TargetContainersModeMax,
29962996
TargetContainersNameRegex: ".*",
2997-
ResourceExpr: ResourceExpr{
2997+
ResourcesExpr: ResourcesExpr{
29982998
Limits: &ResourceExprLimits{
29992999
CPU: "cpu*30%",
30003000
Memory: "memory*25%",
@@ -3027,9 +3027,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
30273027
Image: "sidecar:latest",
30283028
},
30293029
ResourcesPolicy: &v1beta1.ResourcesPolicy{
3030-
TargetContainerMode: v1beta1.TargetContainerModeSum,
3030+
TargetContainersMode: v1beta1.TargetContainersModeSum,
30313031
TargetContainersNameRegex: "^app.*$",
3032-
ResourceExpr: v1beta1.ResourceExpr{
3032+
ResourcesExpr: v1beta1.ResourcesExpr{
30333033
Limits: &v1beta1.ResourceExprLimits{
30343034
CPU: "cpu*50% + 100m",
30353035
Memory: "max(memory*20% + 100Mi, 200Mi)",
@@ -3055,9 +3055,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
30553055
Image: "sidecar:latest",
30563056
},
30573057
ResourcesPolicy: &ResourcesPolicy{
3058-
TargetContainerMode: TargetContainerModeSum,
3058+
TargetContainersMode: TargetContainersModeSum,
30593059
TargetContainersNameRegex: "^app.*$",
3060-
ResourceExpr: ResourceExpr{
3060+
ResourcesExpr: ResourcesExpr{
30613061
Limits: &ResourceExprLimits{
30623062
CPU: "cpu*50% + 100m",
30633063
Memory: "max(memory*20% + 100Mi, 200Mi)",
@@ -3086,9 +3086,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
30863086
Image: "sidecar:latest",
30873087
},
30883088
ResourcesPolicy: &v1beta1.ResourcesPolicy{
3089-
TargetContainerMode: v1beta1.TargetContainerModeMax,
3089+
TargetContainersMode: v1beta1.TargetContainersModeMax,
30903090
TargetContainersNameRegex: ".*",
3091-
ResourceExpr: v1beta1.ResourceExpr{
3091+
ResourcesExpr: v1beta1.ResourcesExpr{
30923092
Requests: &v1beta1.ResourceExprRequests{
30933093
CPU: "cpu*30% + 50m",
30943094
Memory: "memory*15% + 50Mi",
@@ -3114,9 +3114,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
31143114
Image: "sidecar:latest",
31153115
},
31163116
ResourcesPolicy: &ResourcesPolicy{
3117-
TargetContainerMode: TargetContainerModeMax,
3117+
TargetContainersMode: TargetContainersModeMax,
31183118
TargetContainersNameRegex: ".*",
3119-
ResourceExpr: ResourceExpr{
3119+
ResourcesExpr: ResourcesExpr{
31203120
Requests: &ResourceExprRequests{
31213121
CPU: "cpu*30% + 50m",
31223122
Memory: "memory*15% + 50Mi",
@@ -3145,9 +3145,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
31453145
Image: "init:latest",
31463146
},
31473147
ResourcesPolicy: &v1beta1.ResourcesPolicy{
3148-
TargetContainerMode: v1beta1.TargetContainerModeSum,
3148+
TargetContainersMode: v1beta1.TargetContainersModeSum,
31493149
TargetContainersNameRegex: "^app.*$",
3150-
ResourceExpr: v1beta1.ResourceExpr{
3150+
ResourcesExpr: v1beta1.ResourcesExpr{
31513151
Limits: &v1beta1.ResourceExprLimits{
31523152
CPU: "max(cpu*30%, 50m)",
31533153
Memory: "max(memory*25%, 100Mi)",
@@ -3177,9 +3177,9 @@ func TestSidecarSet_ConvertFrom(t *testing.T) {
31773177
Image: "init:latest",
31783178
},
31793179
ResourcesPolicy: &ResourcesPolicy{
3180-
TargetContainerMode: TargetContainerModeSum,
3180+
TargetContainersMode: TargetContainersModeSum,
31813181
TargetContainersNameRegex: "^app.*$",
3182-
ResourceExpr: ResourceExpr{
3182+
ResourcesExpr: ResourcesExpr{
31833183
Limits: &ResourceExprLimits{
31843184
CPU: "max(cpu*30%, 50m)",
31853185
Memory: "max(memory*25%, 100Mi)",

‎apis/apps/v1alpha1/sidecarset_conversion.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,9 @@ func convertResourcesPolicyToV1Beta1(policy *ResourcesPolicy) *v1beta1.Resources
390390
return nil
391391
}
392392
return &v1beta1.ResourcesPolicy{
393-
TargetContainerMode: v1beta1.TargetContainerModeType(policy.TargetContainerMode),
393+
TargetContainersMode: v1beta1.TargetContainersModeType(policy.TargetContainersMode),
394394
TargetContainersNameRegex: policy.TargetContainersNameRegex,
395-
ResourceExpr: convertResourceExprToV1Beta1(policy.ResourceExpr),
395+
ResourcesExpr: convertResourceExprToV1Beta1(policy.ResourcesExpr),
396396
}
397397
}
398398

@@ -401,14 +401,14 @@ func convertResourcesPolicyToV1Alpha1(policy *v1beta1.ResourcesPolicy) *Resource
401401
return nil
402402
}
403403
return &ResourcesPolicy{
404-
TargetContainerMode: TargetContainerModeType(policy.TargetContainerMode),
404+
TargetContainersMode: TargetContainersModeType(policy.TargetContainersMode),
405405
TargetContainersNameRegex: policy.TargetContainersNameRegex,
406-
ResourceExpr: convertResourceExprToV1Alpha1(policy.ResourceExpr),
406+
ResourcesExpr: convertResourceExprToV1Alpha1(policy.ResourcesExpr),
407407
}
408408
}
409409

410-
func convertResourceExprToV1Beta1(expr ResourceExpr) v1beta1.ResourceExpr {
411-
result := v1beta1.ResourceExpr{}
410+
func convertResourceExprToV1Beta1(expr ResourcesExpr) v1beta1.ResourcesExpr {
411+
result := v1beta1.ResourcesExpr{}
412412
if expr.Limits != nil {
413413
result.Limits = &v1beta1.ResourceExprLimits{
414414
CPU: expr.Limits.CPU,
@@ -424,8 +424,8 @@ func convertResourceExprToV1Beta1(expr ResourceExpr) v1beta1.ResourceExpr {
424424
return result
425425
}
426426

427-
func convertResourceExprToV1Alpha1(expr v1beta1.ResourceExpr) ResourceExpr {
428-
result := ResourceExpr{}
427+
func convertResourceExprToV1Alpha1(expr v1beta1.ResourcesExpr) ResourcesExpr {
428+
result := ResourcesExpr{}
429429
if expr.Limits != nil {
430430
result.Limits = &ResourceExprLimits{
431431
CPU: expr.Limits.CPU,

‎apis/apps/v1alpha1/sidecarset_types.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ type SourceContainerNameSource struct {
185185

186186
// ResourcesPolicy defines the policy for dynamically configuring container resources based on Pod specification during pod creation.
187187
type ResourcesPolicy struct {
188-
// TargetContainerMode defines how to aggregate resources from target containers
188+
// TargetContainersMode defines how to aggregate resources from target containers
189189
// +kubebuilder:validation:Enum=sum;max
190190
// +kubebuilder:validation:Required
191-
TargetContainerMode TargetContainerModeType `json:"targetContainerMode"`
191+
TargetContainersMode TargetContainersModeType `json:"targetContainersMode"`
192192

193193
// TargetContainersNameRegex is the regex pattern to match target container names
194194
// If no container names match this regex, the pod creation request will be rejected by the webhook
@@ -197,24 +197,24 @@ type ResourcesPolicy struct {
197197
// +kubebuilder:default=".*"
198198
TargetContainersNameRegex string `json:"targetContainersNameRegex,omitempty"`
199199

200-
// ResourceExpr defines the expressions for calculating resource values
200+
// ResourcesExpr defines the expressions for calculating resource values
201201
// +kubebuilder:validation:Required
202-
ResourceExpr ResourceExpr `json:"resourceExpr"`
202+
ResourcesExpr ResourcesExpr `json:"resourcesExpr"`
203203
}
204204

205-
// TargetContainerModeType defines how to aggregate resources from target containers
206-
type TargetContainerModeType string
205+
// TargetContainersModeType defines how to aggregate resources from target containers
206+
type TargetContainersModeType string
207207

208208
const (
209-
// TargetContainerModeSum aggregates resources by summing up all matched containers
210-
TargetContainerModeSum TargetContainerModeType = "sum"
209+
// TargetContainersModeSum aggregates resources by summing up all matched containers
210+
TargetContainersModeSum TargetContainersModeType = "sum"
211211

212-
// TargetContainerModeMax aggregates resources by taking the maximum of all matched containers
213-
TargetContainerModeMax TargetContainerModeType = "max"
212+
// TargetContainersModeMax aggregates resources by taking the maximum of all matched containers
213+
TargetContainersModeMax TargetContainersModeType = "max"
214214
)
215215

216-
// ResourceExpr defines the expressions for calculating resource values
217-
type ResourceExpr struct {
216+
// ResourcesExpr defines the expressions for calculating resource values
217+
type ResourcesExpr struct {
218218
// Limits defines expressions for calculating resource limits
219219
// +optional
220220
Limits *ResourceExprLimits `json:"limits,omitempty"`

0 commit comments

Comments
 (0)