Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e30237b8
Commit
e30237b8
authored
Sep 19, 2017
by
Julia Evans
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Validate that cronjob names are less than 52 characters
parent
4e276d49
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
0 deletions
+25
-0
BUILD
pkg/apis/batch/validation/BUILD
+1
-0
validation.go
pkg/apis/batch/validation/validation.go
+8
-0
validation_test.go
pkg/apis/batch/validation/validation_test.go
+16
-0
No files found.
pkg/apis/batch/validation/BUILD
View file @
e30237b8
...
@@ -20,6 +20,7 @@ go_library(
...
@@ -20,6 +20,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
],
],
)
)
...
...
pkg/apis/batch/validation/validation.go
View file @
e30237b8
...
@@ -22,6 +22,7 @@ import (
...
@@ -22,6 +22,7 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
unversionedvalidation
"k8s.io/apimachinery/pkg/apis/meta/v1/validation"
unversionedvalidation
"k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/labels"
apimachineryvalidation
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
apivalidation
"k8s.io/kubernetes/pkg/api/validation"
apivalidation
"k8s.io/kubernetes/pkg/api/validation"
...
@@ -162,6 +163,13 @@ func ValidateCronJob(scheduledJob *batch.CronJob) field.ErrorList {
...
@@ -162,6 +163,13 @@ func ValidateCronJob(scheduledJob *batch.CronJob) field.ErrorList {
// CronJobs and rcs have the same name validation
// CronJobs and rcs have the same name validation
allErrs
:=
apivalidation
.
ValidateObjectMeta
(
&
scheduledJob
.
ObjectMeta
,
true
,
apivalidation
.
ValidateReplicationControllerName
,
field
.
NewPath
(
"metadata"
))
allErrs
:=
apivalidation
.
ValidateObjectMeta
(
&
scheduledJob
.
ObjectMeta
,
true
,
apivalidation
.
ValidateReplicationControllerName
,
field
.
NewPath
(
"metadata"
))
allErrs
=
append
(
allErrs
,
ValidateCronJobSpec
(
&
scheduledJob
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateCronJobSpec
(
&
scheduledJob
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
if
len
(
scheduledJob
.
ObjectMeta
.
Name
)
>
apimachineryvalidation
.
DNS1035LabelMaxLength
-
11
{
// The cronjob controller appends a 11-character suffix to the cronjob (`-$TIMESTAMP`) when
// creating a job. The job name length limit is 63 characters.
// Therefore cronjob names must have length <= 63-11=52. If we don't validate this here,
// then job creation will fail later.
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
field
.
NewPath
(
"metadata"
)
.
Child
(
"name"
),
scheduledJob
.
ObjectMeta
.
Name
,
"must be no more than 52 characters"
))
}
return
allErrs
return
allErrs
}
}
...
...
pkg/apis/batch/validation/validation_test.go
View file @
e30237b8
...
@@ -520,6 +520,22 @@ func TestValidateCronJob(t *testing.T) {
...
@@ -520,6 +520,22 @@ func TestValidateCronJob(t *testing.T) {
},
},
},
},
},
},
"metadata.name: must be no more than 52 characters"
:
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"10000000002000000000300000000040000000005000000000123"
,
Namespace
:
metav1
.
NamespaceDefault
,
UID
:
types
.
UID
(
"1a2b3c"
),
},
Spec
:
batch
.
CronJobSpec
{
Schedule
:
"* * * * ?"
,
ConcurrencyPolicy
:
batch
.
AllowConcurrent
,
JobTemplate
:
batch
.
JobTemplateSpec
{
Spec
:
batch
.
JobSpec
{
Template
:
validPodTemplateSpec
,
},
},
},
},
"spec.jobTemplate.spec.manualSelector: Unsupported value"
:
{
"spec.jobTemplate.spec.manualSelector: Unsupported value"
:
{
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"mycronjob"
,
Name
:
"mycronjob"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment