Skip to content

Commit 920e9e3

Browse files
authored
Merge pull request kubernetes#126977 from aaron-prindle/compat-version-132
chore: bump DefaultKubeBinaryVersion to 1.32, make 1.32 CEL changes, fix int tests to handle 1 version off API deprecation, and fix prerelease-lifecycle-gen for # of APIs
2 parents 1874039 + 701e6c7 commit 920e9e3

File tree

20 files changed

+361
-14
lines changed

20 files changed

+361
-14
lines changed

cmd/kube-apiserver/app/options/validation.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ func (s CompletedOptions) Validate() []error {
142142
errs = append(errs, fmt.Errorf("--apiserver-count should be a positive number, but value '%d' provided", s.MasterCount))
143143
}
144144

145-
// TODO(#125980): remove in 1.32
146145
effectiveVersion := s.GenericServerRunOptions.ComponentGlobalsRegistry.EffectiveVersionFor(s.GenericServerRunOptions.ComponentName)
147146
if err := utilversion.ValidateKubeEffectiveVersion(effectiveVersion); err != nil {
148147
errs = append(errs, err)

cmd/kube-scheduler/app/options/options.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ func (o *Options) Validate() []error {
279279
errs = append(errs, o.Authorization.Validate()...)
280280
errs = append(errs, o.Metrics.Validate()...)
281281

282-
// TODO(#125980): remove in 1.32
283282
effectiveVersion := o.ComponentGlobalsRegistry.EffectiveVersionFor(utilversion.DefaultKubeComponent)
284283
if err := utilversion.ValidateKubeEffectiveVersion(effectiveVersion); err != nil {
285284
errs = append(errs, err)

staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
// +k8s:deepcopy-gen=package
1818
// +k8s:protobuf-gen=package
1919
// +k8s:openapi-gen=true
20+
// +k8s:prerelease-lifecycle-gen=true
2021
// +groupName=admissionregistration.k8s.io
2122

2223
// Package v1alpha1 is the v1alpha1 version of the API.

staging/src/k8s.io/api/admissionregistration/v1alpha1/zz_generated.prerelease-lifecycle.go

Lines changed: 94 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/resource/v1alpha3/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
// +k8s:openapi-gen=true
1818
// +k8s:deepcopy-gen=package
1919
// +k8s:protobuf-gen=package
20-
20+
// +k8s:prerelease-lifecycle-gen=true
2121
// +groupName=resource.k8s.io
2222

2323
// Package v1alpha3 is the v1alpha3 version of the resource API.

staging/src/k8s.io/api/resource/v1alpha3/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ type ResourceSliceList struct {
298298

299299
// +genclient
300300
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
301-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
301+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
302302

303303
// ResourceClaim describes a request for access to resources in the cluster,
304304
// for use by workloads. For example, if a workload needs an accelerator device
@@ -815,7 +815,7 @@ const (
815815
)
816816

817817
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
818-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
818+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
819819

820820
// ResourceClaimList is a collection of claims.
821821
type ResourceClaimList struct {
@@ -830,7 +830,7 @@ type ResourceClaimList struct {
830830

831831
// +genclient
832832
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
833-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
833+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
834834

835835
// PodSchedulingContext objects hold information that is needed to schedule
836836
// a Pod with ResourceClaims that use "WaitForFirstConsumer" allocation
@@ -916,7 +916,7 @@ type ResourceClaimSchedulingStatus struct {
916916
const PodSchedulingNodeListMaxSize = 128
917917

918918
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
919-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
919+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
920920

921921
// PodSchedulingContextList is a collection of Pod scheduling objects.
922922
type PodSchedulingContextList struct {
@@ -1000,7 +1000,7 @@ type DeviceClassConfiguration struct {
10001000
}
10011001

10021002
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
1003-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
1003+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
10041004

10051005
// DeviceClassList is a collection of classes.
10061006
type DeviceClassList struct {
@@ -1015,7 +1015,7 @@ type DeviceClassList struct {
10151015

10161016
// +genclient
10171017
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
1018-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
1018+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
10191019

10201020
// ResourceClaimTemplate is used to produce ResourceClaim objects.
10211021
//
@@ -1050,7 +1050,7 @@ type ResourceClaimTemplateSpec struct {
10501050
}
10511051

10521052
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
1053-
// +k8s:prerelease-lifecycle-gen:introduced=1.26
1053+
// +k8s:prerelease-lifecycle-gen:introduced=1.31
10541054

10551055
// ResourceClaimTemplateList is a collection of claim templates.
10561056
type ResourceClaimTemplateList struct {

0 commit comments

Comments
 (0)