From 42e83ab9841e26f29c6176fcf0098934eec8e1e8 Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Sun, 19 May 2019 13:49:16 -0700 Subject: [PATCH] Work around https://github.com/virtual-kubelet/virtual-kubelet/issues/632 --- providers/mock/mock.go | 8 +++++--- providers/mock/mock_test.go | 11 +++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/providers/mock/mock.go b/providers/mock/mock.go index 0f645b231..967f87d45 100644 --- a/providers/mock/mock.go +++ b/providers/mock/mock.go @@ -13,9 +13,7 @@ import ( "github.com/cpuguy83/strongerrors" "github.com/cpuguy83/strongerrors/status/ocstatus" "github.com/virtual-kubelet/virtual-kubelet/log" - "github.com/virtual-kubelet/virtual-kubelet/providers" "github.com/virtual-kubelet/virtual-kubelet/trace" - "github.com/virtual-kubelet/virtual-kubelet/vkubelet" "github.com/virtual-kubelet/virtual-kubelet/vkubelet/api" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -35,11 +33,14 @@ const ( containerNameKey = "containerName" ) +// See: https://github.com/virtual-kubelet/virtual-kubelet/issues/632 +/* var ( _ providers.Provider = (*MockLegacyProvider)(nil) _ providers.PodMetricsProvider = (*MockLegacyProvider)(nil) _ vkubelet.PodNotifier = (*MockProvider)(nil) ) +*/ // MockLegacyProvider implements the virtual-kubelet provider interface and stores pods in memory. type MockLegacyProvider struct { @@ -455,7 +456,8 @@ func (p *MockLegacyProvider) NodeDaemonEndpoints(ctx context.Context) *v1.NodeDa // This is a noop to default to Linux for now. func (p *MockLegacyProvider) OperatingSystem() string { - return providers.OperatingSystemLinux + // This is harcoded due to: https://github.com/virtual-kubelet/virtual-kubelet/issues/632 + return "Linux" } // GetStatsSummary returns dummy stats for all pods known by this provider. diff --git a/providers/mock/mock_test.go b/providers/mock/mock_test.go index aa3d7b6f0..ced61c3b7 100644 --- a/providers/mock/mock_test.go +++ b/providers/mock/mock_test.go @@ -1,17 +1,12 @@ package mock -import ( - "testing" - - "github.com/virtual-kubelet/virtual-kubelet/vkubelet" - "github.com/virtual-kubelet/virtual-kubelet/providers" - "gotest.tools/assert" -) - // We can guarantee the right interfaces are implemented inside of by putting casts in place. We must do the verification // that a given type *does not* implement a given interface in this test. +// Cannot implement this due to: https://github.com/virtual-kubelet/virtual-kubelet/issues/632 +/* func TestMockLegacyInterface(t *testing.T) { var mlp providers.Provider = &MockLegacyProvider{} _, ok := mlp.(vkubelet.PodNotifier) assert.Assert(t, !ok) } +*/