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
7380424b
Commit
7380424b
authored
Nov 01, 2017
by
Janet Kuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make selector immutable the default behavior, except for legacy versions
parent
298c42bb
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
28 deletions
+4
-28
BUILD
pkg/registry/extensions/daemonset/BUILD
+0
-2
strategy.go
pkg/registry/extensions/daemonset/strategy.go
+1
-7
BUILD
pkg/registry/extensions/deployment/BUILD
+0
-2
strategy.go
pkg/registry/extensions/deployment/strategy.go
+2
-10
BUILD
pkg/registry/extensions/replicaset/BUILD
+0
-2
strategy.go
pkg/registry/extensions/replicaset/strategy.go
+1
-5
No files found.
pkg/registry/extensions/daemonset/BUILD
View file @
7380424b
...
...
@@ -18,8 +18,6 @@ go_library(
"//pkg/api/pod:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/validation:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library",
...
...
pkg/registry/extensions/daemonset/strategy.go
View file @
7380424b
...
...
@@ -17,10 +17,6 @@ limitations under the License.
package
daemonset
import
(
"fmt"
appsv1
"k8s.io/api/apps/v1"
appsv1beta2
"k8s.io/api/apps/v1beta2"
extensionsv1beta1
"k8s.io/api/extensions/v1beta1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apivalidation
"k8s.io/apimachinery/pkg/api/validation"
...
...
@@ -136,11 +132,9 @@ func (daemonSetStrategy) ValidateUpdate(ctx genericapirequest.Context, obj, old
switch
groupVersion
{
case
extensionsv1beta1
.
SchemeGroupVersion
:
// no-op for compatibility
case
appsv1beta2
.
SchemeGroupVersion
,
appsv1
.
SchemeGroupVersion
:
default
:
// disallow mutation of selector
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateImmutableField
(
newDaemonSet
.
Spec
.
Selector
,
oldDaemonSet
.
Spec
.
Selector
,
field
.
NewPath
(
"spec"
)
.
Child
(
"selector"
))
...
)
default
:
panic
(
fmt
.
Sprintf
(
"unexpected group/version: %v"
,
groupVersion
))
}
}
...
...
pkg/registry/extensions/deployment/BUILD
View file @
7380424b
...
...
@@ -19,9 +19,7 @@ go_library(
"//pkg/api/pod:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/validation:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library",
...
...
pkg/registry/extensions/deployment/strategy.go
View file @
7380424b
...
...
@@ -17,11 +17,7 @@ limitations under the License.
package
deployment
import
(
"fmt"
appsv1
"k8s.io/api/apps/v1"
appsv1beta1
"k8s.io/api/apps/v1beta1"
appsv1beta2
"k8s.io/api/apps/v1beta2"
extensionsv1beta1
"k8s.io/api/extensions/v1beta1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apivalidation
"k8s.io/apimachinery/pkg/api/validation"
...
...
@@ -114,15 +110,11 @@ func (deploymentStrategy) ValidateUpdate(ctx genericapirequest.Context, obj, old
if
requestInfo
,
found
:=
genericapirequest
.
RequestInfoFrom
(
ctx
);
found
{
groupVersion
:=
schema
.
GroupVersion
{
Group
:
requestInfo
.
APIGroup
,
Version
:
requestInfo
.
APIVersion
}
switch
groupVersion
{
case
appsv1beta1
.
SchemeGroupVersion
:
// no-op for compatibility
case
extensionsv1beta1
.
SchemeGroupVersion
:
case
appsv1beta1
.
SchemeGroupVersion
,
extensionsv1beta1
.
SchemeGroupVersion
:
// no-op for compatibility
case
appsv1beta2
.
SchemeGroupVersion
,
appsv1
.
SchemeGroupVersion
:
default
:
// disallow mutation of selector
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateImmutableField
(
newDeployment
.
Spec
.
Selector
,
oldDeployment
.
Spec
.
Selector
,
field
.
NewPath
(
"spec"
)
.
Child
(
"selector"
))
...
)
default
:
panic
(
fmt
.
Sprintf
(
"unexpected group/version: %v"
,
groupVersion
))
}
}
...
...
pkg/registry/extensions/replicaset/BUILD
View file @
7380424b
...
...
@@ -19,8 +19,6 @@ go_library(
"//pkg/api/pod:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/validation:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library",
...
...
pkg/registry/extensions/replicaset/strategy.go
View file @
7380424b
...
...
@@ -22,8 +22,6 @@ import (
"fmt"
"strconv"
appsv1
"k8s.io/api/apps/v1"
appsv1beta2
"k8s.io/api/apps/v1beta2"
extensionsv1beta1
"k8s.io/api/extensions/v1beta1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apivalidation
"k8s.io/apimachinery/pkg/api/validation"
...
...
@@ -128,11 +126,9 @@ func (rsStrategy) ValidateUpdate(ctx genericapirequest.Context, obj, old runtime
switch
groupVersion
{
case
extensionsv1beta1
.
SchemeGroupVersion
:
// no-op for compatibility
case
appsv1beta2
.
SchemeGroupVersion
,
appsv1
.
SchemeGroupVersion
:
default
:
// disallow mutation of selector
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateImmutableField
(
newReplicaSet
.
Spec
.
Selector
,
oldReplicaSet
.
Spec
.
Selector
,
field
.
NewPath
(
"spec"
)
.
Child
(
"selector"
))
...
)
default
:
panic
(
fmt
.
Sprintf
(
"unexpected group/version: %v"
,
groupVersion
))
}
}
...
...
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