Skip to content

Commit 0793caa

Browse files
authored
Merge pull request #6498 from RainbowMango/pr_bump_kubernetes_v1332
Bump Kubernetes dependencies from v1.32.3 to v1.33.2
2 parents 3e4771b + 80677b3 commit 0793caa

File tree

1,636 files changed

+81977
-55652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,636 files changed

+81977
-55652
lines changed

api/openapi-spec/swagger.json

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17526,7 +17526,7 @@
1752617526
},
1752717527
"/version/": {
1752817528
"get": {
17529-
"description": "get the code version",
17529+
"description": "get the version information for this server",
1753017530
"consumes": [
1753117531
"application/json"
1753217532
],
@@ -21766,11 +21766,11 @@
2176621766
}
2176721767
},
2176821768
"io.k8s.api.autoscaling.v2.HPAScalingRules": {
21769-
"description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
21769+
"description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
2177021770
"type": "object",
2177121771
"properties": {
2177221772
"policies": {
21773-
"description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
21773+
"description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
2177421774
"type": "array",
2177521775
"items": {
2177621776
"default": {},
@@ -21786,6 +21786,10 @@
2178621786
"description": "stabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).",
2178721787
"type": "integer",
2178821788
"format": "int32"
21789+
},
21790+
"tolerance": {
21791+
"description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate.",
21792+
"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
2178921793
}
2179021794
}
2179121795
},
@@ -23219,6 +23223,11 @@
2321923223
"kind": "DeleteOptions",
2322023224
"version": "v1beta1"
2322123225
},
23226+
{
23227+
"group": "resource.k8s.io",
23228+
"kind": "DeleteOptions",
23229+
"version": "v1beta2"
23230+
},
2322223231
{
2322323232
"group": "scheduling.k8s.io",
2322423233
"kind": "DeleteOptions",
@@ -23986,6 +23995,11 @@
2398623995
"kind": "WatchEvent",
2398723996
"version": "v1beta1"
2398823997
},
23998+
{
23999+
"group": "resource.k8s.io",
24000+
"kind": "WatchEvent",
24001+
"version": "v1beta2"
24002+
},
2398924003
{
2399024004
"group": "scheduling.k8s.io",
2399124005
"kind": "WatchEvent",
@@ -24065,6 +24079,14 @@
2406524079
"type": "string",
2406624080
"default": ""
2406724081
},
24082+
"emulationMajor": {
24083+
"description": "EmulationMajor is the major version of the emulation version",
24084+
"type": "string"
24085+
},
24086+
"emulationMinor": {
24087+
"description": "EmulationMinor is the minor version of the emulation version",
24088+
"type": "string"
24089+
},
2406824090
"gitCommit": {
2406924091
"type": "string",
2407024092
"default": ""
@@ -24082,10 +24104,20 @@
2408224104
"default": ""
2408324105
},
2408424106
"major": {
24107+
"description": "Major is the major version of the binary version",
2408524108
"type": "string",
2408624109
"default": ""
2408724110
},
24111+
"minCompatibilityMajor": {
24112+
"description": "MinCompatibilityMajor is the major version of the minimum compatibility version",
24113+
"type": "string"
24114+
},
24115+
"minCompatibilityMinor": {
24116+
"description": "MinCompatibilityMinor is the minor version of the minimum compatibility version",
24117+
"type": "string"
24118+
},
2408824119
"minor": {
24120+
"description": "Minor is the minor version of the binary version",
2408924121
"type": "string",
2409024122
"default": ""
2409124123
},

charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ spec:
15911591
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
15921592
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
15931593
The volume will be mounted read-only (ro) and non-executable files (noexec).
1594-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
1594+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
15951595
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
15961596
properties:
15971597
pullPolicy:
@@ -2774,7 +2774,7 @@ spec:
27742774
Cannot be updated.
27752775
items:
27762776
description: EnvFromSource represents the source of
2777-
a set of ConfigMaps
2777+
a set of ConfigMaps or Secrets
27782778
properties:
27792779
configMapRef:
27802780
description: The ConfigMap to select from
@@ -2795,8 +2795,8 @@ spec:
27952795
type: object
27962796
x-kubernetes-map-type: atomic
27972797
prefix:
2798-
description: An optional identifier to prepend
2799-
to each key in the ConfigMap. Must be a C_IDENTIFIER.
2798+
description: Optional text to prepend to the name
2799+
of each environment variable. Must be a C_IDENTIFIER.
28002800
type: string
28012801
secretRef:
28022802
description: The Secret to select from
@@ -3062,6 +3062,12 @@ spec:
30623062
- port
30633063
type: object
30643064
type: object
3065+
stopSignal:
3066+
description: |-
3067+
StopSignal defines which signal will be sent to a container when it is being stopped.
3068+
If not specified, the default is defined by the container runtime in use.
3069+
StopSignal can only be set for Pods with a non-empty .spec.os.name
3070+
type: string
30653071
type: object
30663072
livenessProbe:
30673073
description: |-

charts/karmada/_crds/bases/autoscaling/autoscaling.karmada.io_federatedhpas.yaml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ spec:
8282
policies:
8383
description: |-
8484
policies is a list of potential scaling polices which can be used during scaling.
85-
At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid
85+
If not set, use the default values:
86+
- For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window.
87+
- For scale down: allow all pods to be removed in a 15s window.
8688
items:
8789
description: HPAScalingPolicy is a single policy which must
8890
hold true for a specified past interval.
@@ -124,6 +126,24 @@ spec:
124126
- For scale down: 300 (i.e. the stabilization window is 300 seconds long).
125127
format: int32
126128
type: integer
129+
tolerance:
130+
anyOf:
131+
- type: integer
132+
- type: string
133+
description: |-
134+
tolerance is the tolerance on the ratio between the current and desired
135+
metric value under which no updates are made to the desired number of
136+
replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not
137+
set, the default cluster-wide tolerance is applied (by default 10%).
138+
139+
For example, if autoscaling is configured with a memory consumption target of 100Mi,
140+
and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be
141+
triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
142+
143+
This is an alpha field and requires enabling the HPAConfigurableTolerance
144+
feature gate.
145+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
146+
x-kubernetes-int-or-string: true
127147
type: object
128148
scaleUp:
129149
description: |-
@@ -136,7 +156,9 @@ spec:
136156
policies:
137157
description: |-
138158
policies is a list of potential scaling polices which can be used during scaling.
139-
At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid
159+
If not set, use the default values:
160+
- For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window.
161+
- For scale down: allow all pods to be removed in a 15s window.
140162
items:
141163
description: HPAScalingPolicy is a single policy which must
142164
hold true for a specified past interval.
@@ -178,6 +200,24 @@ spec:
178200
- For scale down: 300 (i.e. the stabilization window is 300 seconds long).
179201
format: int32
180202
type: integer
203+
tolerance:
204+
anyOf:
205+
- type: integer
206+
- type: string
207+
description: |-
208+
tolerance is the tolerance on the ratio between the current and desired
209+
metric value under which no updates are made to the desired number of
210+
replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not
211+
set, the default cluster-wide tolerance is applied (by default 10%).
212+
213+
For example, if autoscaling is configured with a memory consumption target of 100Mi,
214+
and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be
215+
triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
216+
217+
This is an alpha field and requires enabling the HPAConfigurableTolerance
218+
feature gate.
219+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
220+
x-kubernetes-int-or-string: true
181221
type: object
182222
type: object
183223
maxReplicas:

cmd/aggregated-apiserver/app/options/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333
genericfilters "k8s.io/apiserver/pkg/server/filters"
3434
genericoptions "k8s.io/apiserver/pkg/server/options"
3535
"k8s.io/apiserver/pkg/storage/storagebackend"
36+
"k8s.io/apiserver/pkg/util/compatibility"
3637
utilfeature "k8s.io/apiserver/pkg/util/feature"
3738
"k8s.io/client-go/kubernetes"
3839
"k8s.io/client-go/util/flowcontrol"
39-
cbversion "k8s.io/component-base/version"
4040
"k8s.io/klog/v2"
4141
netutils "k8s.io/utils/net"
4242

@@ -123,7 +123,7 @@ func (o *Options) Run(ctx context.Context) error {
123123
restConfig := config.GenericConfig.ClientConfig
124124
restConfig.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(o.KubeAPIQPS, o.KubeAPIBurst)
125125
secretLister := config.GenericConfig.SharedInformerFactory.Core().V1().Secrets().Lister()
126-
config.GenericConfig.EffectiveVersion = cbversion.NewEffectiveVersion("1.0")
126+
config.GenericConfig.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion()
127127

128128
server, err := config.Complete().New(restConfig, secretLister)
129129
if err != nil {

cmd/karmada-search/app/karmada-search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ import (
3131
genericapiserver "k8s.io/apiserver/pkg/server"
3232
genericfilters "k8s.io/apiserver/pkg/server/filters"
3333
genericoptions "k8s.io/apiserver/pkg/server/options"
34+
"k8s.io/apiserver/pkg/util/compatibility"
3435
"k8s.io/client-go/rest"
3536
"k8s.io/client-go/util/flowcontrol"
3637
cliflag "k8s.io/component-base/cli/flag"
3738
"k8s.io/component-base/logs"
3839
logsv1 "k8s.io/component-base/logs/api/v1"
3940
"k8s.io/component-base/term"
40-
cbversion "k8s.io/component-base/version"
4141
"k8s.io/klog/v2"
4242
netutils "k8s.io/utils/net"
4343
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -192,7 +192,7 @@ func config(o *options.Options, outOfTreeRegistryOptions ...Option) (*search.Con
192192
}
193193

194194
serverConfig.ClientConfig.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(o.KubeAPIQPS, o.KubeAPIBurst)
195-
serverConfig.Config.EffectiveVersion = cbversion.NewEffectiveVersion("1.0")
195+
serverConfig.Config.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion()
196196

197197
httpClient, err := rest.HTTPClientFor(serverConfig.ClientConfig)
198198
if err != nil {

0 commit comments

Comments
 (0)