github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GetOptions in client calls

Browse Source
This commit is contained in:
Wojciech Tyczynski
2016-12-07 14:26:33 +01:00
parent cff55e5894
commit e8d1cba875
70 changed files with 225 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/deployment/util/deployment_util.go
View File

@@ -677,7 +677,7 @@ func FindOldReplicaSets(deployment *extensions.Deployment, rsList []*extensions.
// WaitForReplicaSetUpdated polls the replica set until it is updated.
func WaitForReplicaSetUpdated(c clientset.Interface, desiredGeneration int64, namespace, name string) error {
return wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) {
rs, err := c.Extensions().ReplicaSets(namespace).Get(name)
rs, err := c.Extensions().ReplicaSets(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return false, err
}
@@ -688,7 +688,7 @@ func WaitForReplicaSetUpdated(c clientset.Interface, desiredGeneration int64, na
// WaitForPodsHashPopulated polls the replica set until updated and fully labeled.
func WaitForPodsHashPopulated(c clientset.Interface, desiredGeneration int64, namespace, name string) error {
return wait.Poll(1*time.Second, 1*time.Minute, func() (bool, error) {
rs, err := c.Extensions().ReplicaSets(namespace).Get(name)
rs, err := c.Extensions().ReplicaSets(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return false, err
}