Skip to content

Commit 32241db

Browse files
committed
v1beta2: Remove deprecated retryDelayMinutes field
Remove the retryDelayMinutes field from v1beta2 AdmissionCheckSpec as it has been deprecated since v0.8. This field was unused and provided no functionality. Changes: - Remove RetryDelayMinutes field from v1beta2 AdmissionCheckSpec - Update conversion functions to ignore retryDelayMinutes during v1beta1 to v1beta2 conversion - Update test to remove retryDelayMinutes usage - Regenerate deepcopy, conversion code, and CRD manifests The field remains available in v1beta1 for backward compatibility. Addresses part of issue #7247
1 parent b559e70 commit 32241db

File tree

6 files changed

+28
-41
lines changed

6 files changed

+28
-41
lines changed

apis/kueue/v1beta1/zz_generated.conversion.go

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

apis/kueue/v1beta2/admissioncheck_types.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ type AdmissionCheckSpec struct {
5252
// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="field is immutable"
5353
ControllerName string `json:"controllerName"`
5454

55-
// retryDelayMinutes specifies how long to keep the workload suspended after
56-
// a failed check (after it transitioned to False). When the delay period has passed, the check
57-
// state goes to "Unknown". The default is 15 min.
58-
// +optional
59-
// +kubebuilder:default=15
60-
// Deprecated: retryDelayMinutes has already been deprecated since v0.8 and will be removed in v1beta2.
61-
RetryDelayMinutes *int64 `json:"retryDelayMinutes,omitempty"`
62-
6355
// parameters identifies a configuration with additional parameters for the
6456
// check.
6557
// +optional

apis/kueue/v1beta2/zz_generated.deepcopy.go

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

client-go/applyconfiguration/kueue/v1beta2/admissioncheckspec.go

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

config/components/crd/bases/kueue.x-k8s.io_admissionchecks.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,6 @@ spec:
213213
- kind
214214
- name
215215
type: object
216-
retryDelayMinutes:
217-
default: 15
218-
description: |-
219-
retryDelayMinutes specifies how long to keep the workload suspended after
220-
a failed check (after it transitioned to False). When the delay period has passed, the check
221-
state goes to "Unknown". The default is 15 min.
222-
Deprecated: retryDelayMinutes has already been deprecated since v0.8 and will be removed in v1beta2.
223-
format: int64
224-
type: integer
225216
required:
226217
- controllerName
227218
type: object

test/integration/singlecluster/webhook/core/admissioncheck_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/onsi/gomega"
2525
"github.com/onsi/gomega/types"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/utils/ptr"
27+
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/manager"
3030

@@ -67,8 +67,7 @@ var _ = ginkgo.Describe("AdmissionCheck Webhook", ginkgo.Ordered, func() {
6767
Name: "foo",
6868
},
6969
Spec: kueue.AdmissionCheckSpec{
70-
ControllerName: "ac-controller",
71-
RetryDelayMinutes: ptr.To[int64](15),
70+
ControllerName: "ac-controller",
7271
},
7372
},
7473
),

0 commit comments

Comments
 (0)