Skip to content

K
k3s
Commit 4abd7304 authored by Yecheng Fu's avatar Yecheng Fu
Browse files
Options

Do one more level of casting to get the 'assumeCache'

parent 3315474f
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
pkg/controller/volume/scheduling/scheduler_assume_cache.go
View file @ 4abd7304
...@@ -345,7 +345,7 @@ type PVAssumeCache interface { ...@@ -345,7 +345,7 @@ type PVAssumeCache interface {
} }
type pvAssumeCache struct { type pvAssumeCache struct {
*assumeCache AssumeCache
} }
func pvStorageClassIndexFunc(obj interface{}) ([]string, error) { func pvStorageClassIndexFunc(obj interface{}) ([]string, error) {
...@@ -357,7 +357,7 @@ func pvStorageClassIndexFunc(obj interface{}) ([]string, error) { ...@@ -357,7 +357,7 @@ func pvStorageClassIndexFunc(obj interface{}) ([]string, error) {
// NewPVAssumeCache creates a PV assume cache. // NewPVAssumeCache creates a PV assume cache.
func NewPVAssumeCache(informer cache.SharedIndexInformer) PVAssumeCache { func NewPVAssumeCache(informer cache.SharedIndexInformer) PVAssumeCache {
return &pvAssumeCache{NewAssumeCache(informer, "v1.PersistentVolume", "storageclass", pvStorageClassIndexFunc).(*assumeCache)} return &pvAssumeCache{NewAssumeCache(informer, "v1.PersistentVolume", "storageclass", pvStorageClassIndexFunc)}
} }
func (c *pvAssumeCache) GetPV(pvName string) (*v1.PersistentVolume, error) { func (c *pvAssumeCache) GetPV(pvName string) (*v1.PersistentVolume, error) {
...@@ -413,12 +413,12 @@ type PVCAssumeCache interface { ...@@ -413,12 +413,12 @@ type PVCAssumeCache interface {
} }
type pvcAssumeCache struct { type pvcAssumeCache struct {
*assumeCache AssumeCache
} }
// NewPVCAssumeCache creates a PVC assume cache. // NewPVCAssumeCache creates a PVC assume cache.
func NewPVCAssumeCache(informer cache.SharedIndexInformer) PVCAssumeCache { func NewPVCAssumeCache(informer cache.SharedIndexInformer) PVCAssumeCache {
return &pvcAssumeCache{NewAssumeCache(informer, "v1.PersistentVolumeClaim", "namespace", cache.MetaNamespaceIndexFunc).(*assumeCache)} return &pvcAssumeCache{NewAssumeCache(informer, "v1.PersistentVolumeClaim", "namespace", cache.MetaNamespaceIndexFunc)}
} }
func (c *pvcAssumeCache) GetPVC(pvcKey string) (*v1.PersistentVolumeClaim, error) { func (c *pvcAssumeCache) GetPVC(pvcKey string) (*v1.PersistentVolumeClaim, error) {
......
pkg/controller/volume/scheduling/scheduler_assume_cache_test.go
View file @ 4abd7304
...@@ -109,7 +109,7 @@ func TestAssumePV(t *testing.T) { ...@@ -109,7 +109,7 @@ func TestAssumePV(t *testing.T) {
for name, scenario := range scenarios { for name, scenario := range scenarios {
cache := NewPVAssumeCache(nil) cache := NewPVAssumeCache(nil)
internalCache, ok := cache.(*pvAssumeCache) internalCache, ok := cache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -143,7 +143,7 @@ func TestAssumePV(t *testing.T) { ...@@ -143,7 +143,7 @@ func TestAssumePV(t *testing.T) {
func TestRestorePV(t *testing.T) { func TestRestorePV(t *testing.T) {
cache := NewPVAssumeCache(nil) cache := NewPVAssumeCache(nil)
internalCache, ok := cache.(*pvAssumeCache) internalCache, ok := cache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -183,7 +183,7 @@ func TestRestorePV(t *testing.T) { ...@@ -183,7 +183,7 @@ func TestRestorePV(t *testing.T) {
func TestBasicPVCache(t *testing.T) { func TestBasicPVCache(t *testing.T) {
cache := NewPVAssumeCache(nil) cache := NewPVAssumeCache(nil)
internalCache, ok := cache.(*pvAssumeCache) internalCache, ok := cache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -227,7 +227,7 @@ func TestBasicPVCache(t *testing.T) { ...@@ -227,7 +227,7 @@ func TestBasicPVCache(t *testing.T) {
func TestPVCacheWithStorageClasses(t *testing.T) { func TestPVCacheWithStorageClasses(t *testing.T) {
cache := NewPVAssumeCache(nil) cache := NewPVAssumeCache(nil)
internalCache, ok := cache.(*pvAssumeCache) internalCache, ok := cache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -273,7 +273,7 @@ func TestPVCacheWithStorageClasses(t *testing.T) { ...@@ -273,7 +273,7 @@ func TestPVCacheWithStorageClasses(t *testing.T) {
func TestAssumeUpdatePVCache(t *testing.T) { func TestAssumeUpdatePVCache(t *testing.T) {
cache := NewPVAssumeCache(nil) cache := NewPVAssumeCache(nil)
internalCache, ok := cache.(*pvAssumeCache) internalCache, ok := cache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -366,7 +366,7 @@ func TestAssumePVC(t *testing.T) { ...@@ -366,7 +366,7 @@ func TestAssumePVC(t *testing.T) {
for name, scenario := range scenarios { for name, scenario := range scenarios {
cache := NewPVCAssumeCache(nil) cache := NewPVCAssumeCache(nil)
internalCache, ok := cache.(*pvcAssumeCache) internalCache, ok := cache.(*pvcAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -400,7 +400,7 @@ func TestAssumePVC(t *testing.T) { ...@@ -400,7 +400,7 @@ func TestAssumePVC(t *testing.T) {
func TestRestorePVC(t *testing.T) { func TestRestorePVC(t *testing.T) {
cache := NewPVCAssumeCache(nil) cache := NewPVCAssumeCache(nil)
internalCache, ok := cache.(*pvcAssumeCache) internalCache, ok := cache.(*pvcAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
...@@ -440,7 +440,7 @@ func TestRestorePVC(t *testing.T) { ...@@ -440,7 +440,7 @@ func TestRestorePVC(t *testing.T) {
func TestAssumeUpdatePVCCache(t *testing.T) { func TestAssumeUpdatePVCCache(t *testing.T) {
cache := NewPVCAssumeCache(nil) cache := NewPVCAssumeCache(nil)
internalCache, ok := cache.(*pvcAssumeCache) internalCache, ok := cache.(*pvcAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to get internal cache") t.Fatalf("Failed to get internal cache")
} }
......
pkg/controller/volume/scheduling/scheduler_binder_test.go
View file @ 4abd7304
...@@ -103,8 +103,8 @@ type testEnv struct { ...@@ -103,8 +103,8 @@ type testEnv struct {
binder SchedulerVolumeBinder binder SchedulerVolumeBinder
internalBinder *volumeBinder internalBinder *volumeBinder
internalNodeInformer coreinformers.NodeInformer internalNodeInformer coreinformers.NodeInformer
internalPVCache *pvAssumeCache internalPVCache *assumeCache
internalPVCCache *pvcAssumeCache internalPVCCache *assumeCache
} }
func newTestBinder(t *testing.T, stopCh <-chan struct{}) *testEnv { func newTestBinder(t *testing.T, stopCh <-chan struct{}) *testEnv {
...@@ -206,13 +206,13 @@ func newTestBinder(t *testing.T, stopCh <-chan struct{}) *testEnv { ...@@ -206,13 +206,13 @@ func newTestBinder(t *testing.T, stopCh <-chan struct{}) *testEnv {
} }
pvCache := internalBinder.pvCache pvCache := internalBinder.pvCache
internalPVCache, ok := pvCache.(*pvAssumeCache) internalPVCache, ok := pvCache.(*pvAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to convert to internal PV cache") t.Fatalf("Failed to convert to internal PV cache")
} }
pvcCache := internalBinder.pvcCache pvcCache := internalBinder.pvcCache
internalPVCCache, ok := pvcCache.(*pvcAssumeCache) internalPVCCache, ok := pvcCache.(*pvcAssumeCache).AssumeCache.(*assumeCache)
if !ok { if !ok {
t.Fatalf("Failed to convert to internal PVC cache") t.Fatalf("Failed to convert to internal PVC cache")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment