Merge pull request #88875 from apelisse/apply-no-op

SSA: Applying same object twice should be a no-op the second time

Kubernetes-commit: 71ad0a90205c12e8ebbe6872db30097026916659
This commit is contained in:
Kubernetes Publisher
2020-03-08 16:40:55 +00:00
3 changed files with 15 additions and 15 deletions
+6 -6
View File
@@ -5,9 +5,9 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/api v0.0.0-20200308145338-5c56b6577da0
k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab
k8s.io/client-go v0.0.0-20200308145338-aad7e5b6d4c2
k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
k8s.io/klog v1.0.0
)
@@ -15,8 +15,8 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200306170923-e4148040f8d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb
k8s.io/client-go => k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa
k8s.io/api => k8s.io/api v0.0.0-20200308145338-5c56b6577da0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab
k8s.io/client-go => k8s.io/client-go v0.0.0-20200308145338-aad7e5b6d4c2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
)