kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128862 from MariamFahmy98/map-unit-tests 

fix: remove duplicated unit tests in JSONPatch and ApplyConfiguration

Kubernetes-commit: 43f50b4e51302e443b4836c45666bfedbaf70406
This commit is contained in:
Kubernetes Publisher 2024-12-12 04:12:53 +00:00
parent ea0b9ced4d b858201395
commit 47024d970a
4 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -54,7 +54,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20241206182100-8b216f34d7ed
k8s.io/apimachinery v0.0.0-20241212054420-6e120e1a46e1
k8s.io/client-go v0.0.0-20241206182637-8e21410d16a5
k8s.io/client-go v0.0.0-20241212055154-706280d1e7c8
k8s.io/component-base v0.0.0-20241206184758-96018783480f
k8s.io/klog/v2 v2.130.1
k8s.io/kms v0.0.0-20241206185237-ab1750fa1ba2

4
go.sum
View File

@ -369,8 +369,8 @@ k8s.io/api v0.0.0-20241206182100-8b216f34d7ed h1:I/5qfHM86vTbxgBF5ndeCJyTDVoJy/r
k8s.io/api v0.0.0-20241206182100-8b216f34d7ed/go.mod h1:lUM9fsfbAc6N6JbIwnis087wfRQs4x/1VDpNyw4Un6c=
k8s.io/apimachinery v0.0.0-20241212054420-6e120e1a46e1 h1:80IlEOFbCKCnZZRkwjGP5TPx7Nvx5UyhR7ihknEcJhU=
k8s.io/apimachinery v0.0.0-20241212054420-6e120e1a46e1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/client-go v0.0.0-20241206182637-8e21410d16a5 h1:jFY2Dq4WCHUiLhVH1tUVGSnasQfC1GKLb0XS82M8SuA=
k8s.io/client-go v0.0.0-20241206182637-8e21410d16a5/go.mod h1:+EKe/iO3HMSO9z7b4PPYsYkdz0MlAy1ezGkYEwqNWnc=
k8s.io/client-go v0.0.0-20241212055154-706280d1e7c8 h1:NHmq7kh1wCrQczoTEgi+llNoC1HLbxbh2q9T22qYEck=
k8s.io/client-go v0.0.0-20241212055154-706280d1e7c8/go.mod h1:TcUDBmfZ4VqblPEfRjbqqDg/dWjqNskTfSuwtPJfsCg=
k8s.io/component-base v0.0.0-20241206184758-96018783480f h1:RTc92IdMxq+Q0F1d4x7YPF7lCjDI+cQ86ZMwuI35E2Q=
k8s.io/component-base v0.0.0-20241206184758-96018783480f/go.mod h1:gFyRWyoxH6tMBrslFolZA4gPIXd9csFGGanhsY9CH8E=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

10
pkg/admission/plugin/policy/mutating/patch/json_patch_test.go
View File

@ -46,16 +46,6 @@ func TestJSONPatch(t *testing.T) {
expectedResult runtime.Object
expectedErr string
}{
{
name: "jsonPatch with false test operation",
expression: `[
JSONPatch{op: "test", path: "/spec/replicas", value: 100},
JSONPatch{op: "replace", path: "/spec/replicas", value: 3},
]`,
gvr: deploymentGVR,
object: &appsv1.Deployment{Spec: appsv1.DeploymentSpec{Replicas: ptr.To[int32](1)}},
expectedResult: &appsv1.Deployment{Spec: appsv1.DeploymentSpec{Replicas: ptr.To[int32](1)}},
},
{
name: "jsonPatch with false test operation",
expression: `[

29
pkg/admission/plugin/policy/mutating/patch/smd_test.go
View File

@ -51,35 +51,6 @@ func TestApplyConfiguration(t *testing.T) {
expectedResult runtime.Object
expectedErr string
}{
{
name: "apply configuration add to listType=map",
expression: `Object{
spec: Object.spec{
template: Object.spec.template{
spec: Object.spec.template.spec{
volumes: [Object.spec.template.spec.volumes{
name: "y"
}]
}
}
}
}`,
gvr: deploymentGVR,
object: &appsv1.Deployment{Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{{Name: "x"}},
},
},
}},
expectedResult: &appsv1.Deployment{Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{{Name: "x"}, {Name: "y"}},
},
},
}},
},
{
name: "apply configuration add to listType=map",
expression: `Object{