Move CLI related packages into internal (#697)
We don't want people to import these packages, so move these out into private packages.
This commit is contained in:
Brian Goff
21
internal/manager/doc.go
Normal file
21
internal/manager/doc.go
Normal file
@@ -0,0 +1,21 @@
|
||||
// Copyright © 2017 The virtual-kubelet authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// Package manager provides access to kubernetes resources for providers.
|
||||
//
|
||||
// DEPRECATION WARNING:
|
||||
// Though this package is still in use, it should be considered deprecated as it
|
||||
// is just wrapping a k8s client and not much else.
|
||||
// Implementers should look at replacing their use of this with something else.
|
||||
package manager
|
||||
68
internal/manager/resource.go
Normal file
68
internal/manager/resource.go
Normal file
@@ -0,0 +1,68 @@
|
||||
// Copyright © 2017 The virtual-kubelet authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package manager
|
||||
|
||||
import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
corev1listers "k8s.io/client-go/listers/core/v1"
|
||||
|
||||
"github.com/virtual-kubelet/virtual-kubelet/log"
|
||||
)
|
||||
|
||||
// ResourceManager acts as a passthrough to a cache (lister) for pods assigned to the current node.
|
||||
// It is also a passthrough to a cache (lister) for Kubernetes secrets and config maps.
|
||||
type ResourceManager struct {
|
||||
podLister corev1listers.PodLister
|
||||
secretLister corev1listers.SecretLister
|
||||
configMapLister corev1listers.ConfigMapLister
|
||||
serviceLister corev1listers.ServiceLister
|
||||
}
|
||||
|
||||
// NewResourceManager returns a ResourceManager with the internal maps initialized.
|
||||
func NewResourceManager(podLister corev1listers.PodLister, secretLister corev1listers.SecretLister, configMapLister corev1listers.ConfigMapLister, serviceLister corev1listers.ServiceLister) (*ResourceManager, error) {
|
||||
rm := ResourceManager{
|
||||
podLister: podLister,
|
||||
secretLister: secretLister,
|
||||
configMapLister: configMapLister,
|
||||
serviceLister: serviceLister,
|
||||
}
|
||||
return &rm, nil
|
||||
}
|
||||
|
||||
// GetPods returns a list of all known pods assigned to this virtual node.
|
||||
func (rm *ResourceManager) GetPods() []*v1.Pod {
|
||||
l, err := rm.podLister.List(labels.Everything())
|
||||
if err == nil {
|
||||
return l
|
||||
}
|
||||
log.L.Errorf("failed to fetch pods from lister: %v", err)
|
||||
return make([]*v1.Pod, 0)
|
||||
}
|
||||
|
||||
// GetConfigMap retrieves the specified config map from the cache.
|
||||
func (rm *ResourceManager) GetConfigMap(name, namespace string) (*v1.ConfigMap, error) {
|
||||
return rm.configMapLister.ConfigMaps(namespace).Get(name)
|
||||
}
|
||||
|
||||
// GetSecret retrieves the specified secret from Kubernetes.
|
||||
func (rm *ResourceManager) GetSecret(name, namespace string) (*v1.Secret, error) {
|
||||
return rm.secretLister.Secrets(namespace).Get(name)
|
||||
}
|
||||
|
||||
// ListServices retrieves the list of services from Kubernetes.
|
||||
func (rm *ResourceManager) ListServices() ([]*v1.Service, error) {
|
||||
return rm.serviceLister.List(labels.Everything())
|
||||
}
|
||||
166
internal/manager/resource_test.go
Normal file
166
internal/manager/resource_test.go
Normal file
@@ -0,0 +1,166 @@
|
||||
// Copyright © 2017 The virtual-kubelet authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package manager_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
corev1listers "k8s.io/client-go/listers/core/v1"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
|
||||
"github.com/virtual-kubelet/virtual-kubelet/internal/manager"
|
||||
testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
|
||||
)
|
||||
|
||||
// TestGetPods verifies that the resource manager acts as a passthrough to a pod lister.
|
||||
func TestGetPods(t *testing.T) {
|
||||
var (
|
||||
lsPods = []*v1.Pod{
|
||||
testutil.FakePodWithSingleContainer("namespace-0", "name-0", "image-0"),
|
||||
testutil.FakePodWithSingleContainer("namespace-1", "name-1", "image-1"),
|
||||
}
|
||||
)
|
||||
|
||||
// Create a pod lister that will list the pods defined above.
|
||||
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
|
||||
for _, pod := range lsPods {
|
||||
indexer.Add(pod)
|
||||
}
|
||||
podLister := corev1listers.NewPodLister(indexer)
|
||||
|
||||
// Create a new instance of the resource manager based on the pod lister.
|
||||
rm, err := manager.NewResourceManager(podLister, nil, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check that the resource manager returns two pods in the call to "GetPods".
|
||||
rmPods := rm.GetPods()
|
||||
if len(rmPods) != len(lsPods) {
|
||||
t.Fatalf("expected %d pods, found %d", len(lsPods), len(rmPods))
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetSecret verifies that the resource manager acts as a passthrough to a secret lister.
|
||||
func TestGetSecret(t *testing.T) {
|
||||
var (
|
||||
lsSecrets = []*v1.Secret{
|
||||
testutil.FakeSecret("namespace-0", "name-0", map[string]string{"key-0": "val-0"}),
|
||||
testutil.FakeSecret("namespace-1", "name-1", map[string]string{"key-1": "val-1"}),
|
||||
}
|
||||
)
|
||||
|
||||
// Create a secret lister that will list the secrets defined above.
|
||||
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
|
||||
for _, secret := range lsSecrets {
|
||||
indexer.Add(secret)
|
||||
}
|
||||
secretLister := corev1listers.NewSecretLister(indexer)
|
||||
|
||||
// Create a new instance of the resource manager based on the secret lister.
|
||||
rm, err := manager.NewResourceManager(nil, secretLister, nil, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Get the secret with coordinates "namespace-0/name-0".
|
||||
secret, err := rm.GetSecret("name-0", "namespace-0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
value := secret.Data["key-0"]
|
||||
if string(value) != "val-0" {
|
||||
t.Fatal("got unexpected value", string(value))
|
||||
}
|
||||
|
||||
// Try to get a secret that does not exist, and make sure we've got a "not found" error as a response.
|
||||
_, err = rm.GetSecret("name-X", "namespace-X")
|
||||
if err == nil || !errors.IsNotFound(err) {
|
||||
t.Fatalf("expected a 'not found' error, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetConfigMap verifies that the resource manager acts as a passthrough to a config map lister.
|
||||
func TestGetConfigMap(t *testing.T) {
|
||||
var (
|
||||
lsConfigMaps = []*v1.ConfigMap{
|
||||
testutil.FakeConfigMap("namespace-0", "name-0", map[string]string{"key-0": "val-0"}),
|
||||
testutil.FakeConfigMap("namespace-1", "name-1", map[string]string{"key-1": "val-1"}),
|
||||
}
|
||||
)
|
||||
|
||||
// Create a config map lister that will list the config maps defined above.
|
||||
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
|
||||
for _, secret := range lsConfigMaps {
|
||||
indexer.Add(secret)
|
||||
}
|
||||
configMapLister := corev1listers.NewConfigMapLister(indexer)
|
||||
|
||||
// Create a new instance of the resource manager based on the config map lister.
|
||||
rm, err := manager.NewResourceManager(nil, nil, configMapLister, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Get the config map with coordinates "namespace-0/name-0".
|
||||
configMap, err := rm.GetConfigMap("name-0", "namespace-0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
value := configMap.Data["key-0"]
|
||||
if value != "val-0" {
|
||||
t.Fatal("got unexpected value", string(value))
|
||||
}
|
||||
|
||||
// Try to get a configmap that does not exist, and make sure we've got a "not found" error as a response.
|
||||
_, err = rm.GetConfigMap("name-X", "namespace-X")
|
||||
if err == nil || !errors.IsNotFound(err) {
|
||||
t.Fatalf("expected a 'not found' error, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestListServices verifies that the resource manager acts as a passthrough to a service lister.
|
||||
func TestListServices(t *testing.T) {
|
||||
var (
|
||||
lsServices = []*v1.Service{
|
||||
testutil.FakeService("namespace-0", "service-0", "1.2.3.1", "TCP", 8081),
|
||||
testutil.FakeService("namespace-1", "service-1", "1.2.3.2", "TCP", 8082),
|
||||
}
|
||||
)
|
||||
|
||||
// Create a pod lister that will list the pods defined above.
|
||||
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
|
||||
for _, service := range lsServices {
|
||||
indexer.Add(service)
|
||||
}
|
||||
serviceLister := corev1listers.NewServiceLister(indexer)
|
||||
|
||||
// Create a new instance of the resource manager based on the pod lister.
|
||||
rm, err := manager.NewResourceManager(nil, nil, nil, serviceLister)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Check that the resource manager returns two pods in the call to "GetPods".
|
||||
services, err := rm.ListServices()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(lsServices) != len(services) {
|
||||
t.Fatalf("expected %d services, found %d", len(lsServices), len(services))
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
|
||||
"github.com/virtual-kubelet/virtual-kubelet/manager"
|
||||
"github.com/virtual-kubelet/virtual-kubelet/internal/manager"
|
||||
)
|
||||
|
||||
// FakeResourceManager returns an instance of the resource manager that will return the specified objects when its "GetX" methods are called.
|
||||
|
||||
Reference in New Issue
Block a user