rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-31 04:40:56 +00:00
Code Issues Releases Wiki Activity

Add storage interface to scaled context

Browse Source 
Added storage interface to scaled context. Prior, there was no
way to interact with storage API without using k8s API directly.
Now, client exists for storage API.
This commit is contained in:
rmweir
2019-07-31 12:08:23 -07:00
parent 23c78c662d
commit 9aa56d31e6
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/context.go
View File

@@ -26,6 +26,7 @@ import (
projectv3 "github.com/rancher/types/apis/project.cattle.io/v3"
projectSchema "github.com/rancher/types/apis/project.cattle.io/v3/schema"
rbacv1 "github.com/rancher/types/apis/rbac.authorization.k8s.io/v1"
storagev1 "github.com/rancher/types/apis/storage.k8s.io/v1"
"github.com/rancher/types/config/dialer"
"github.com/rancher/types/peermanager"
"github.com/rancher/types/user"
@@ -59,6 +60,7 @@ type ScaledContext struct {
Project projectv3.Interface
RBAC rbacv1.Interface
Core corev1.Interface
Storage storagev1.Interface
}
func (c *ScaledContext) controllers() []controller.Starter {
@@ -115,7 +117,6 @@ func NewScaledContext(config rest.Config) (*ScaledContext, error) {
if err != nil {
return nil, err
}
dynamicConfig := config
if dynamicConfig.NegotiatedSerializer == nil {
dynamicConfig.NegotiatedSerializer = dynamic.NegotiatedSerializer
@@ -193,6 +194,7 @@ type UserContext struct {
Monitoring monitoringv1.Interface
Cluster clusterv3.Interface
Istio istiov1alpha3.Interface
Storage storagev1.Interface
}
func (w *UserContext) controllers() []controller.Starter {
@@ -208,6 +210,7 @@ func (w *UserContext) controllers() []controller.Starter {
w.Networking,
w.Monitoring,
w.Cluster,
w.Storage,
}
}
@@ -230,6 +233,7 @@ func (w *UserContext) UserOnlyContext() *UserOnlyContext {
Monitoring: w.Monitoring,
Cluster: w.Cluster,
Istio: w.Istio,
Storage: w.Storage,
}
}
@@ -252,6 +256,7 @@ type UserOnlyContext struct {
Monitoring monitoringv1.Interface
Cluster clusterv3.Interface
Istio istiov1alpha3.Interface
Storage storagev1.Interface
}
func (w *UserOnlyContext) controllers() []controller.Starter {
@@ -265,6 +270,7 @@ func (w *UserOnlyContext) controllers() []controller.Starter {
w.BatchV1,
w.BatchV1Beta1,
w.Monitoring,
w.Storage,
}
}
@@ -381,6 +387,11 @@ func NewUserContext(scaledContext *ScaledContext, config rest.Config, clusterNam
return nil, err
}
context.Storage, err = storagev1.NewForConfig(config)
if err != nil {
return nil, err
}
context.RBAC, err = rbacv1.NewForConfig(config)
if err != nil {
return nil, err
@@ -489,6 +500,11 @@ func NewUserOnlyContext(config rest.Config) (*UserOnlyContext, error) {
return nil, err
}
context.Storage, err = storagev1.NewForConfig(config)
if err != nil {
return nil, err
}
context.RBAC, err = rbacv1.NewForConfig(config)
if err != nil {
return nil, err