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
44ec189f
Commit
44ec189f
authored
Sep 21, 2017
by
jennybuckley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed logic with updates in initializer plugin
parent
98ed5dd8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
initialization.go
plugin/pkg/admission/initialization/initialization.go
+7
-3
initialization_test.go
plugin/pkg/admission/initialization/initialization_test.go
+16
-0
No files found.
plugin/pkg/admission/initialization/initialization.go
View file @
44ec189f
...
...
@@ -208,6 +208,13 @@ func (i *initializer) Admit(a admission.Attributes) (err error) {
}
updated
:=
accessor
.
GetInitializers
()
// controllers deployed with an empty initializers.pending have their initializers set to nil
// but should be able to update without changing their manifest
if
updated
!=
nil
&&
len
(
updated
.
Pending
)
==
0
&&
updated
.
Result
==
nil
{
accessor
.
SetInitializers
(
nil
)
updated
=
nil
}
existingAccessor
,
err
:=
meta
.
Accessor
(
a
.
GetOldObject
())
if
err
!=
nil
{
// if the old object does not have an accessor, but the new one does, error out
...
...
@@ -222,9 +229,6 @@ func (i *initializer) Admit(a admission.Attributes) (err error) {
glog
.
V
(
5
)
.
Infof
(
"Modifying uninitialized resource %s"
,
a
.
GetResource
())
if
updated
!=
nil
&&
len
(
updated
.
Pending
)
==
0
&&
updated
.
Result
==
nil
{
accessor
.
SetInitializers
(
nil
)
}
// because we are called before validation, we need to ensure the update transition is valid.
if
errs
:=
validation
.
ValidateInitializersUpdate
(
updated
,
existing
,
initializerFieldPath
);
len
(
errs
)
>
0
{
return
errors
.
NewInvalid
(
a
.
GetKind
()
.
GroupKind
(),
a
.
GetName
(),
errs
)
...
...
plugin/pkg/admission/initialization/initialization_test.go
View file @
44ec189f
...
...
@@ -152,6 +152,22 @@ func TestAdmitUpdate(t *testing.T) {
newInitializers
:
&
metav1
.
Initializers
{
Pending
:
[]
metav1
.
Initializer
{{
Name
:
"init.k8s.io"
}}},
err
:
"field is immutable once initialization has completed"
,
},
{
name
:
"empty initializer list is treated as nil initializer"
,
oldInitializers
:
nil
,
newInitializers
:
&
metav1
.
Initializers
{},
verifyUpdatedObj
:
func
(
obj
runtime
.
Object
)
(
bool
,
string
)
{
accessor
,
err
:=
meta
.
Accessor
(
obj
)
if
err
!=
nil
{
return
false
,
"cannot get accessor"
}
if
accessor
.
GetInitializers
()
!=
nil
{
return
false
,
"expect nil initializers"
}
return
true
,
""
},
err
:
""
,
},
}
plugin
:=
initializer
{
...
...
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