Skip to content

Commit ed67bd7

Browse files
authored
Merge pull request kubernetes#128336 from soltysh/cronjob_timestamp_stable
Promote job creation timestamp annotation to stable
2 parents b95484e + db94009 commit ed67bd7

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

pkg/features/kube_features.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ const (
147147
ContainerCheckpoint featuregate.Feature = "ContainerCheckpoint"
148148

149149
// owner: @helayoty
150+
// kep: https://kep.k8s.io/4026
151+
//
150152
// Set the scheduled time as an annotation in the job.
151153
CronJobsScheduledAnnotation featuregate.Feature = "CronJobsScheduledAnnotation"
152154

pkg/features/versioned_kube_features.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
114114

115115
CronJobsScheduledAnnotation: {
116116
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta},
117+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.35
117118
},
118119

119120
// inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed

staging/src/k8s.io/api/batch/v1/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ const (
2929

3030
// CronJobScheduledTimestampAnnotation is the scheduled timestamp annotation for the Job.
3131
// It records the original/expected scheduled timestamp for the running job, represented in RFC3339.
32-
// The CronJob controller adds this annotation if the CronJobsScheduledAnnotation feature gate (beta in 1.28) is enabled.
3332
CronJobScheduledTimestampAnnotation = labelPrefix + "cronjob-scheduled-timestamp"
3433

3534
JobCompletionIndexAnnotation = labelPrefix + "job-completion-index"

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@
286286
lockToDefault: false
287287
preRelease: Beta
288288
version: "1.28"
289+
- default: true
290+
lockToDefault: true
291+
preRelease: GA
292+
version: "1.32"
289293
- name: CrossNamespaceVolumeDataSource
290294
versionedSpecs:
291295
- default: false

0 commit comments

Comments
 (0)