Update dependencies to v0.15.10 tag

Godeps/Godeps.json

@@ -188,11 +188,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "v0.15.11"
+			"Rev": "v0.15.10"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "v0.15.11"
+			"Rev": "v0.15.10"
 		},
 		{
 			"ImportPath": "k8s.io/klog",

go.mod

@@ -26,8 +26,8 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
 	golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
 	google.golang.org/appengine v1.5.0 // indirect
-	k8s.io/api v0.15.11
-	k8s.io/apimachinery v0.15.11
+	k8s.io/api v0.15.10
+	k8s.io/apimachinery v0.15.10
 	k8s.io/klog v0.3.1
 	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 	sigs.k8s.io/yaml v1.1.0
@@ -37,6 +37,6 @@ replace (
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/api => k8s.io/api v0.15.11
-	k8s.io/apimachinery => k8s.io/apimachinery v0.15.11
+	k8s.io/api => k8s.io/api v0.15.10
+	k8s.io/apimachinery => k8s.io/apimachinery v0.15.10
 )

go.sum

@@ -93,8 +93,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/api v0.15.11/go.mod h1:DI3kWWWBG0byhZ4druNYQvleDRhbocPrm+Glq4xVpkM=
-k8s.io/apimachinery v0.15.11/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
+k8s.io/api v0.15.10/go.mod h1:PffiEKNf0aFiv2naEYSGTFHIGA9V8Qwt22DZIAokOzQ=
+k8s.io/apimachinery v0.15.10/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
 k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

tools/cache/thread_safe_store.go

@@ -292,13 +292,6 @@ func (c *threadSafeMap) deleteFromIndices(obj interface{}, key string) {
 			set := index[indexValue]
 			if set != nil {
 				set.Delete(key)
-
-				// If we don't delete the set when zero, indices with high cardinality
-				// short lived resources can cause memory to increase over time from
-				// unused empty sets. See `kubernetes/kubernetes/issues/84959`.
-				if len(set) == 0 {
-					delete(index, indexValue)
-				}
 			}
 		}
 	}

tools/cache/thread_safe_store_test.go

@@ -1,92 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cache
-
-import (
-	"testing"
-)
-
-func TestThreadSafeStoreDeleteRemovesEmptySetsFromIndex(t *testing.T) {
-	testIndexer := "testIndexer"
-
-	indexers := Indexers{
-		testIndexer: func(obj interface{}) (strings []string, e error) {
-			indexes := []string{obj.(string)}
-			return indexes, nil
-		},
-	}
-
-	indices := Indices{}
-	store := NewThreadSafeStore(indexers, indices).(*threadSafeMap)
-
-	testKey := "testKey"
-
-	store.Add(testKey, testKey)
-
-	// Assumption check, there should be a set for the `testKey` with one element in the added index
-	set := store.indices[testIndexer][testKey]
-
-	if len(set) != 1 {
-		t.Errorf("Initial assumption of index backing string set having 1 element failed. Actual elements: %d", len(set))
-		return
-	}
-
-	store.Delete(testKey)
-	set, present := store.indices[testIndexer][testKey]
-
-	if present {
-		t.Errorf("Index backing string set not deleted from index. Set length: %d", len(set))
-	}
-}
-
-func TestThreadSafeStoreAddKeepsNonEmptySetPostDeleteFromIndex(t *testing.T) {
-	testIndexer := "testIndexer"
-	testIndex := "testIndex"
-
-	indexers := Indexers{
-		testIndexer: func(obj interface{}) (strings []string, e error) {
-			indexes := []string{testIndex}
-			return indexes, nil
-		},
-	}
-
-	indices := Indices{}
-	store := NewThreadSafeStore(indexers, indices).(*threadSafeMap)
-
-	store.Add("retain", "retain")
-	store.Add("delete", "delete")
-
-	// Assumption check, there should be a set for the `testIndex` with two elements
-	set := store.indices[testIndexer][testIndex]
-
-	if len(set) != 2 {
-		t.Errorf("Initial assumption of index backing string set having 2 elements failed. Actual elements: %d", len(set))
-		return
-	}
-
-	store.Delete("delete")
-	set, present := store.indices[testIndexer][testIndex]
-
-	if !present {
-		t.Errorf("Index backing string set erroneously deleted from index.")
-		return
-	}
-
-	if len(set) != 1 {
-		t.Errorf("Index backing string set has incorrect length, expect 1. Set length: %d", len(set))
-	}
-}

util/connrotation/connrotation.go

@@ -77,6 +77,11 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
 
 	closable := &closableConn{Conn: conn}
 
+	// Start tracking the connection
+	d.mu.Lock()
+	d.conns[closable] = struct{}{}
+	d.mu.Unlock()
+
 	// When the connection is closed, remove it from the map. This will
 	// be no-op if the connection isn't in the map, e.g. if CloseAll()
 	// is called.
@@ -86,11 +91,6 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
 		d.mu.Unlock()
 	}
 
-	// Start tracking the connection
-	d.mu.Lock()
-	d.conns[closable] = struct{}{}
-	d.mu.Unlock()
-
 	return closable, nil
 }
 

util/connrotation/connrotation_test.go

@@ -19,8 +19,6 @@ package connrotation
 import (
 	"context"
 	"net"
-	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
 )
@@ -52,73 +50,6 @@ func TestCloseAll(t *testing.T) {
 	}
 }
 
-// TestCloseAllRace ensures CloseAll works with connections being simultaneously dialed
-func TestCloseAllRace(t *testing.T) {
-	conns := int64(0)
-	dialer := NewDialer(func(ctx context.Context, network, address string) (net.Conn, error) {
-		return closeOnlyConn{onClose: func() { atomic.AddInt64(&conns, -1) }}, nil
-	})
-
-	done := make(chan struct{})
-	wg := &sync.WaitGroup{}
-
-	// Close all as fast as we can
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-done:
-				return
-			default:
-				dialer.CloseAll()
-			}
-		}
-	}()
-
-	// Dial as fast as we can
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-done:
-				return
-			default:
-				if _, err := dialer.Dial("", ""); err != nil {
-					t.Error(err)
-					return
-				}
-				atomic.AddInt64(&conns, 1)
-			}
-		}
-	}()
-
-	// Soak to ensure no races
-	time.Sleep(time.Second)
-
-	// Signal completion
-	close(done)
-	// Wait for goroutines
-	wg.Wait()
-	// Ensure CloseAll ran after all dials
-	dialer.CloseAll()
-
-	// Expect all connections to close within 5 seconds
-	for start := time.Now(); time.Now().Sub(start) < 5*time.Second; time.Sleep(10 * time.Millisecond) {
-		// Ensure all connections were closed
-		if c := atomic.LoadInt64(&conns); c == 0 {
-			break
-		} else {
-			t.Logf("got %d open connections, want 0, will retry", c)
-		}
-	}
-	// Ensure all connections were closed
-	if c := atomic.LoadInt64(&conns); c != 0 {
-		t.Fatalf("got %d open connections, want 0", c)
-	}
-}
-
 type closeOnlyConn struct {
 	net.Conn
 	onClose func()