Skip to content

Commit 90c9f7b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#93901 from jpbetz/atomic-structs
Treat LabelSelectors as atomic by Server Side Apply to fix kubernetes#92913
2 parents 2603cc1 + 8874bdf commit 90c9f7b

File tree

49 files changed

+494
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+494
-75
lines changed

‎api/openapi-spec/swagger.json‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ require (
128128
k8s.io/klog/v2 v2.2.0
129129
k8s.io/kube-aggregator v0.0.0
130130
k8s.io/kube-controller-manager v0.0.0
131-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
131+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
132132
k8s.io/kube-proxy v0.0.0
133133
k8s.io/kube-scheduler v0.0.0
134134
k8s.io/kubectl v0.0.0
@@ -478,7 +478,7 @@ replace (
478478
k8s.io/klog/v2 => k8s.io/klog/v2 v2.2.0
479479
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
480480
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
481-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
481+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
482482
k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy
483483
k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler
484484
k8s.io/kubectl => ./staging/src/k8s.io/kubectl
@@ -499,6 +499,6 @@ replace (
499499
rsc.io/pdf => rsc.io/pdf v0.1.1
500500
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12
501501
sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible
502-
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.1
502+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20201001033253-b3cf1e8ff931
503503
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0
504504
)

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
553553
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
554554
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
555555
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
556-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=
557-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
556+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=
557+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
558558
k8s.io/system-validators v1.2.0 h1:D8clGm3PIsgX0bHoQWQXC8W/rTi6jRKejQGk7z/yuDY=
559559
k8s.io/system-validators v1.2.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
560560
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
@@ -569,7 +569,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12 h1:2XkvsmLI1ZEaT
569569
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
570570
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
571571
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
572-
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=
573-
sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
572+
sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20201001033253-b3cf1e8ff931 h1:yVLDXKoTYiwY8feHY3AcPUEd1q/O2KPVdy5/uTnuZZw=
573+
sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20201001033253-b3cf1e8ff931/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
574574
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
575575
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

‎staging/src/k8s.io/api/go.sum‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
k8s.io/code-generator v0.0.0
2929
k8s.io/component-base v0.0.0
3030
k8s.io/klog/v2 v2.2.0
31-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
31+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
3232
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
3333
sigs.k8s.io/yaml v1.2.0
3434
)

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ require (
3333
gopkg.in/inf.v0 v0.9.1
3434
gopkg.in/yaml.v2 v2.2.8
3535
k8s.io/klog/v2 v2.2.0
36-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
37-
sigs.k8s.io/structured-merge-diff/v4 v4.0.1
36+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
37+
sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20201001033253-b3cf1e8ff931
3838
sigs.k8s.io/yaml v1.2.0
3939
)
4040

‎staging/src/k8s.io/apimachinery/go.sum‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)