d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Work around https://github.com/virtual-kubelet/virtual-kubelet/issues/632

Browse Source
This commit is contained in:
Sargun Dhillon
2019-05-19 13:49:16 -07:00
parent dd71a884b3
commit 42e83ab984
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
providers/mock/mock.go
View File

@@ -13,9 +13,7 @@ import (
"github.com/cpuguy83/strongerrors" "github.com/cpuguy83/strongerrors"
"github.com/cpuguy83/strongerrors/status/ocstatus" "github.com/cpuguy83/strongerrors/status/ocstatus"
"github.com/virtual-kubelet/virtual-kubelet/log" "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/trace"
"github.com/virtual-kubelet/virtual-kubelet/vkubelet"
"github.com/virtual-kubelet/virtual-kubelet/vkubelet/api" "github.com/virtual-kubelet/virtual-kubelet/vkubelet/api"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@@ -35,11 +33,14 @@ const (
containerNameKey = "containerName" containerNameKey = "containerName"
) )
// See: https://github.com/virtual-kubelet/virtual-kubelet/issues/632
/*
var ( var (
_ providers.Provider = (*MockLegacyProvider)(nil) _ providers.Provider = (*MockLegacyProvider)(nil)
_ providers.PodMetricsProvider = (*MockLegacyProvider)(nil) _ providers.PodMetricsProvider = (*MockLegacyProvider)(nil)
_ vkubelet.PodNotifier = (*MockProvider)(nil) _ vkubelet.PodNotifier = (*MockProvider)(nil)
) )
*/
// MockLegacyProvider implements the virtual-kubelet provider interface and stores pods in memory. // MockLegacyProvider implements the virtual-kubelet provider interface and stores pods in memory.
type MockLegacyProvider struct { 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. // This is a noop to default to Linux for now.
func (p *MockLegacyProvider) OperatingSystem() string { 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. // GetStatsSummary returns dummy stats for all pods known by this provider.

11
providers/mock/mock_test.go
View File

@@ -1,17 +1,12 @@
package mock 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 // 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. // 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) { func TestMockLegacyInterface(t *testing.T) {
var mlp providers.Provider = &MockLegacyProvider{} var mlp providers.Provider = &MockLegacyProvider{}
_, ok := mlp.(vkubelet.PodNotifier) _, ok := mlp.(vkubelet.PodNotifier)
assert.Assert(t, !ok) assert.Assert(t, !ok)
} }
*/