github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-25 11:31:44 +00:00
Code Issues Projects Releases Wiki Activity

use job completion index annotation as label

Browse Source
This commit is contained in:
Daniel Vega-Myhre 2023-07-13 21:03:18 +00:00
parent 98c6e25c37
commit 1ae60c0ed1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/job/indexed_job_utils.go
View File

@ -315,7 +315,8 @@ func addCompletionIndexLabel(template *v1.PodTemplateSpec, index int) {
if template.Labels == nil { if template.Labels == nil {
template.Labels = make(map[string]string, 1) template.Labels = make(map[string]string, 1)
} }
template.Labels[batch.JobCompletionIndexLabel] = strconv.Itoa(index) // For consistency, we use the annotation batch.kubernetes.io/job-completion-index for the corresponding label as well.
template.Labels[batch.JobCompletionIndexAnnotation] = strconv.Itoa(index)
} }
func podGenerateNameWithIndex(jobName string, index int) string { func podGenerateNameWithIndex(jobName string, index int) string {

4
pkg/controller/job/job_controller_test.go
View File

@ -4413,8 +4413,8 @@ func TestFinalizersRemovedExpectations(t *testing.T) {
func checkJobCompletionLabel(t *testing.T, p *v1.PodTemplateSpec) { func checkJobCompletionLabel(t *testing.T, p *v1.PodTemplateSpec) {
t.Helper() t.Helper()
labels := p.GetLabels() labels := p.GetLabels()
if labels == nil || labels[batch.JobCompletionIndexLabel] == "" { if labels == nil || labels[batch.JobCompletionIndexAnnotation] == "" {
t.Errorf("missing expected pod label %s", batch.JobCompletionIndexLabel) t.Errorf("missing expected pod label %s", batch.JobCompletionIndexAnnotation)
} }
} }

3
staging/src/k8s.io/api/apps/v1/types.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
@ -29,6 +29,7 @@ const (
DeprecatedRollbackTo = "deprecated.deployment.rollback.to" DeprecatedRollbackTo = "deprecated.deployment.rollback.to"
DeprecatedTemplateGeneration = "deprecated.daemonset.template.generation" DeprecatedTemplateGeneration = "deprecated.daemonset.template.generation"
StatefulSetPodNameLabel = "statefulset.kubernetes.io/pod-name" StatefulSetPodNameLabel = "statefulset.kubernetes.io/pod-name"
StatefulSetPodIndexLabel = "statefulset.kubernetes.io/pod-index"
) )
// +genclient // +genclient

2
staging/src/k8s.io/api/batch/v1/types.go
View File

@ -28,8 +28,6 @@ const (
labelPrefix = "batch.kubernetes.io/" labelPrefix = "batch.kubernetes.io/"
JobCompletionIndexAnnotation = labelPrefix + "job-completion-index" JobCompletionIndexAnnotation = labelPrefix + "job-completion-index"
// JobCompletionIndexLabel is defined following the format <controller>.kubernetes.io/pod-index
JobCompletionIndexLabel = "job.kubernetes.io/pod-index"
// JobTrackingFinalizer is a finalizer for Job's pods. It prevents them from // JobTrackingFinalizer is a finalizer for Job's pods. It prevents them from
// being deleted before being accounted in the Job status. // being deleted before being accounted in the Job status.
// //