From 6b05ac10f07b9203b5aac5cdbcd50a1162a757d7 Mon Sep 17 00:00:00 2001 From: Connor Doyle Date: Wed, 22 Nov 2017 10:01:14 -0800 Subject: [PATCH 1/5] Add balajismaniam, ConnorDoyle node-e2e approvers --- test/e2e_node/OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e_node/OWNERS b/test/e2e_node/OWNERS index 1827549d6e0..c625c03e736 100644 --- a/test/e2e_node/OWNERS +++ b/test/e2e_node/OWNERS @@ -4,5 +4,7 @@ approvers: - vishh - derekwaynecarr - yujuhong +- balajismaniam +- ConnorDoyle reviewers: - sig-node-reviewers From 5800c32fb67849c44a404f371dd70e1c9122d31e Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Sat, 23 Dec 2017 17:17:35 +0800 Subject: [PATCH 2/5] [quota controller] remove extra queue.Add() requeue immediately after an error may end-up with hot-loop --- pkg/controller/resourcequota/resource_quota_controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index b2ae6d1f6e2..ccd43de8ab0 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -308,7 +308,6 @@ func (rq *ResourceQuotaController) syncResourceQuotaFromKey(key string) (err err } if err != nil { glog.Infof("Unable to retrieve resource quota %v from store: %v", key, err) - rq.queue.Add(key) return err } return rq.syncResourceQuota(quota) From f91858d86883b6eab21efa0f6cb6dbee1fa8074a Mon Sep 17 00:00:00 2001 From: Di Xu Date: Thu, 21 Dec 2017 17:34:34 +0800 Subject: [PATCH 3/5] add hostPorts to pod describer --- pkg/printers/internalversion/describe.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index 43bc2b98113..7a7401e42a4 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -1315,11 +1315,13 @@ func describeContainerBasicInfo(container api.Container, status api.ContainerSta if strings.Contains(portString, ",") { w.Write(LEVEL_2, "Ports:\t%s\n", portString) } else { - if len(portString) == 0 { - w.Write(LEVEL_2, "Port:\t\n") - } else { - w.Write(LEVEL_2, "Port:\t%s\n", portString) - } + w.Write(LEVEL_2, "Port:\t%s\n", stringOrNone(portString)) + } + hostPortString := describeContainerHostPorts(container.Ports) + if strings.Contains(hostPortString, ",") { + w.Write(LEVEL_2, "Host Ports:\t%s\n", hostPortString) + } else { + w.Write(LEVEL_2, "Host Port:\t%s\n", stringOrNone(hostPortString)) } } @@ -1331,6 +1333,14 @@ func describeContainerPorts(cPorts []api.ContainerPort) string { return strings.Join(ports, ", ") } +func describeContainerHostPorts(cPorts []api.ContainerPort) string { + ports := make([]string, 0, len(cPorts)) + for _, cPort := range cPorts { + ports = append(ports, fmt.Sprintf("%d/%s", cPort.HostPort, cPort.Protocol)) + } + return strings.Join(ports, ", ") +} + func describeContainerCommand(container api.Container, w PrefixWriter) { if len(container.Command) > 0 { w.Write(LEVEL_2, "Command:\n") From 5b854e7b17d68e191b74501afb72fc5fb9582e1b Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 16 Jan 2018 11:00:43 -0500 Subject: [PATCH 4/5] say which lease is being acquired --- .../k8s.io/client-go/tools/leaderelection/leaderelection.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go index 2ce546bc426..e41b420c987 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go +++ b/staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go @@ -171,11 +171,11 @@ func (le *LeaderElector) IsLeader() bool { // acquire loops calling tryAcquireOrRenew and returns immediately when tryAcquireOrRenew succeeds. func (le *LeaderElector) acquire() { stop := make(chan struct{}) - glog.Infof("attempting to acquire leader lease...") + desc := le.config.Lock.Describe() + glog.Infof("attempting to acquire leader lease %v...", desc) wait.JitterUntil(func() { succeeded := le.tryAcquireOrRenew() le.maybeReportTransition() - desc := le.config.Lock.Describe() if !succeeded { glog.V(4).Infof("failed to acquire lease %v", desc) return From 87af8e085dc2dfe4b3c51b9eb5bf5da618e95f19 Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Tue, 16 Jan 2018 11:21:06 -0800 Subject: [PATCH 5/5] Change default volume source to regular emptydir for e2e volume servers --- test/e2e/framework/volume_util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/framework/volume_util.go b/test/e2e/framework/volume_util.go index 88e60243f7c..9ca69ecb1f1 100644 --- a/test/e2e/framework/volume_util.go +++ b/test/e2e/framework/volume_util.go @@ -244,7 +244,7 @@ func StartVolumeServer(client clientset.Interface, config VolumeTestConfig) *v1. mountName := fmt.Sprintf("path%d", i) volumes[i].Name = mountName if src == "" { - volumes[i].VolumeSource.EmptyDir = &v1.EmptyDirVolumeSource{Medium: v1.StorageMediumMemory} + volumes[i].VolumeSource.EmptyDir = &v1.EmptyDirVolumeSource{} } else { volumes[i].VolumeSource.HostPath = &v1.HostPathVolumeSource{ Path: src,