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

Provide method to correctly build Pod Key from names in the mock provider (#99)

Browse Source
This commit is contained in:
lcastellano
2018-02-23 11:31:00 -08:00
committed by Robbie Zhang
parent 6d8b865848
commit d80dbbe561
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
providers/mock/mock.go
View File

@@ -77,9 +77,9 @@ func (p *MockProvider) DeletePod(pod *v1.Pod) (err error) {
// GetPod returns a pod by name that is stored in memory. // GetPod returns a pod by name that is stored in memory.
func (p *MockProvider) GetPod(namespace, name string) (pod *v1.Pod, err error) { func (p *MockProvider) GetPod(namespace, name string) (pod *v1.Pod, err error) {
log.Printf("receive GetPod %q\n", pod.Name) log.Printf("receive GetPod %q\n", name)
key, err := buildKey(pod) key, err := buildKeyFromNames(namespace, name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -246,6 +246,10 @@ func (p *MockProvider) OperatingSystem() string {
return providers.OperatingSystemLinux return providers.OperatingSystemLinux
} }
func buildKeyFromNames(namespace string, name string) (string, error) {
return fmt.Sprintf("%s-%s", namespace, name), nil
}
// buildKey is a helper for building the "key" for the providers pod store. // buildKey is a helper for building the "key" for the providers pod store.
func buildKey(pod *v1.Pod) (string, error) { func buildKey(pod *v1.Pod) (string, error) {
if pod.ObjectMeta.Namespace == "" { if pod.ObjectMeta.Namespace == "" {
@@ -256,5 +260,5 @@ func buildKey(pod *v1.Pod) (string, error) {
return "", fmt.Errorf("pod name not found") return "", fmt.Errorf("pod name not found")
} }
return fmt.Sprintf("%s-%s", pod.ObjectMeta.Namespace, pod.ObjectMeta.Name), nil return buildKeyFromNames(pod.ObjectMeta.Namespace, pod.ObjectMeta.Name)
} }