From bc13e7431ac992d9327adddccb4074739612c94b Mon Sep 17 00:00:00 2001 From: Jim Minter Date: Wed, 4 Jul 2018 07:54:37 -0500 Subject: [PATCH 1/2] UPSTREAM: 62085: Fixes incorrect atomic usage --- .../apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go index 887adbe8f649..fb396bca56a0 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go +++ b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go @@ -399,7 +399,7 @@ func TestRoundTripRedirects(t *testing.T) { var redirects int32 = 0 server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { if redirects < test.redirects { - redirects = atomic.AddInt32(&redirects, 1) + atomic.AddInt32(&redirects, 1) http.Redirect(w, req, "redirect", http.StatusFound) return } From 7af5a25f97e4c7c109fa92c9f8a7d4947300bd03 Mon Sep 17 00:00:00 2001 From: Jim Minter Date: Wed, 4 Jul 2018 07:59:30 -0500 Subject: [PATCH 2/2] fix the go 1.10 unit test failures --- pkg/apps/strategy/recreate/recreate_test.go | 10 +++++----- pkg/cmd/server/start/start_node.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apps/strategy/recreate/recreate_test.go b/pkg/apps/strategy/recreate/recreate_test.go index 42edb3b5ba6d..0d67f61710c2 100644 --- a/pkg/apps/strategy/recreate/recreate_test.go +++ b/pkg/apps/strategy/recreate/recreate_test.go @@ -221,7 +221,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) { } if len(controllerClient.scaleEvents) > 0 { - t.Fatalf("unexpected scaling events: %d", controllerClient.scaleEvents) + t.Fatalf("unexpected scaling events: %v", controllerClient.scaleEvents) } } @@ -253,7 +253,7 @@ func TestRecreate_deploymentMidHookSuccess(t *testing.T) { } if len(controllerClient.scaleEvents) > 0 { - t.Fatalf("unexpected scaling events: %d", controllerClient.scaleEvents) + t.Fatalf("unexpected scaling events: %v", controllerClient.scaleEvents) } } @@ -405,10 +405,10 @@ func TestRecreate_acceptorSuccessWithColdCaches(t *testing.T) { if len(controllerClient.scaleEvents) != 2 { t.Fatalf("expected 2 scale calls, got %d", len(controllerClient.scaleEvents)) } - if r := controllerClient.scaleEvents[0]; r.Spec.Replicas != 1 { + if r := controllerClient.scaleEvents[0].Spec.Replicas; r != 1 { t.Errorf("expected first scale event to be 1 replica, got %d", r) } - if r := controllerClient.scaleEvents[1]; r.Spec.Replicas != 2 { + if r := controllerClient.scaleEvents[1].Spec.Replicas; r != 2 { t.Errorf("expected second scale event to be 2 replica, got %d", r) } } @@ -445,6 +445,6 @@ func TestRecreate_acceptorFail(t *testing.T) { t.Fatalf("expected 1 scale calls, got %d", len(rcClient.scaleEvents)) } if r := rcClient.scaleEvents[0]; r.Spec.Replicas != 1 { - t.Errorf("expected first scale event to be 1 replica, got %d", r) + t.Errorf("expected first scale event to be 1 replica, got %v", r) } } diff --git a/pkg/cmd/server/start/start_node.go b/pkg/cmd/server/start/start_node.go index 62c65e4e5f0c..926a4810c594 100644 --- a/pkg/cmd/server/start/start_node.go +++ b/pkg/cmd/server/start/start_node.go @@ -419,7 +419,7 @@ func execKubelet(kubeletArgs []string) error { for i, s := range os.Args { if s == "--vmodule" { if i+1 < len(os.Args) { - args = append(args, fmt.Sprintf("--vmodule=", os.Args[i+1])) + args = append(args, fmt.Sprintf("--vmodule=%q", os.Args[i+1])) break } }