-
Notifications
You must be signed in to change notification settings - Fork 38.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Containerized mount utilities #53440
Merged
k8s-github-robot
merged 3 commits into
kubernetes:master
from
jsafrane:mount-container4-10-03
Nov 14, 2017
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
||
go_library( | ||
name = "go_default_library", | ||
srcs = ["mount_pod.go"], | ||
importpath = "k8s.io/kubernetes/pkg/kubelet/mountpod", | ||
visibility = ["//visibility:public"], | ||
deps = [ | ||
"//pkg/kubelet/config:go_default_library", | ||
"//pkg/kubelet/pod:go_default_library", | ||
"//pkg/util/strings:go_default_library", | ||
"//vendor/k8s.io/api/core/v1:go_default_library", | ||
], | ||
) | ||
|
||
go_test( | ||
name = "go_default_test", | ||
srcs = ["mount_pod_test.go"], | ||
importpath = "k8s.io/kubernetes/pkg/kubelet/mountpod", | ||
library = ":go_default_library", | ||
deps = [ | ||
"//pkg/kubelet/configmap:go_default_library", | ||
"//pkg/kubelet/pod:go_default_library", | ||
"//pkg/kubelet/pod/testing:go_default_library", | ||
"//pkg/kubelet/secret:go_default_library", | ||
"//vendor/github.com/golang/glog:go_default_library", | ||
"//vendor/k8s.io/api/core/v1:go_default_library", | ||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||
"//vendor/k8s.io/client-go/util/testing:go_default_library", | ||
], | ||
) | ||
|
||
filegroup( | ||
name = "package-srcs", | ||
srcs = glob(["**"]), | ||
tags = ["automanaged"], | ||
visibility = ["//visibility:private"], | ||
) | ||
|
||
filegroup( | ||
name = "all-srcs", | ||
srcs = [":package-srcs"], | ||
tags = ["automanaged"], | ||
visibility = ["//visibility:public"], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
/* | ||
Copyright 2017 The Kubernetes 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 mountpod | ||
|
||
import ( | ||
"encoding/json" | ||
"fmt" | ||
"io/ioutil" | ||
"os" | ||
"path" | ||
|
||
"k8s.io/api/core/v1" | ||
"k8s.io/kubernetes/pkg/kubelet/config" | ||
kubepod "k8s.io/kubernetes/pkg/kubelet/pod" | ||
"k8s.io/kubernetes/pkg/util/strings" | ||
) | ||
|
||
// Manager is an interface that tracks pods with mount utilities for individual | ||
// volume plugins. | ||
type Manager interface { | ||
GetMountPod(pluginName string) (pod *v1.Pod, container string, err error) | ||
} | ||
|
||
// basicManager is simple implementation of Manager. Pods with mount utilities | ||
// are registered by placing a JSON file into | ||
// /var/lib/kubelet/plugin-containers/<plugin name>.json and this manager just | ||
// finds them there. | ||
type basicManager struct { | ||
registrationDirectory string | ||
podManager kubepod.Manager | ||
} | ||
|
||
// volumePluginRegistration specified format of the json files placed in | ||
// /var/lib/kubelet/plugin-containers/ | ||
type volumePluginRegistration struct { | ||
PodName string `json:"podName"` | ||
PodNamespace string `json:"podNamespace"` | ||
PodUID string `json:"podUID"` | ||
ContainerName string `json:"containerName"` | ||
} | ||
|
||
// NewManager returns a new mount pod manager. | ||
func NewManager(rootDirectory string, podManager kubepod.Manager) (Manager, error) { | ||
regPath := path.Join(rootDirectory, config.DefaultKubeletPluginContainersDirName) | ||
|
||
// Create the directory on startup | ||
os.MkdirAll(regPath, 0700) | ||
|
||
return &basicManager{ | ||
registrationDirectory: regPath, | ||
podManager: podManager, | ||
}, nil | ||
} | ||
|
||
func (m *basicManager) getVolumePluginRegistrationPath(pluginName string) string { | ||
// sanitize plugin name so it does not escape directory | ||
safePluginName := strings.EscapePluginName(pluginName) + ".json" | ||
return path.Join(m.registrationDirectory, safePluginName) | ||
} | ||
|
||
func (m *basicManager) GetMountPod(pluginName string) (pod *v1.Pod, containerName string, err error) { | ||
// Read /var/lib/kubelet/plugin-containers/<plugin name>.json | ||
regPath := m.getVolumePluginRegistrationPath(pluginName) | ||
regBytes, err := ioutil.ReadFile(regPath) | ||
if err != nil { | ||
if os.IsNotExist(err) { | ||
// No pod is registered for this plugin | ||
return nil, "", nil | ||
} | ||
return nil, "", fmt.Errorf("cannot read %s: %v", regPath, err) | ||
} | ||
|
||
// Parse json | ||
var reg volumePluginRegistration | ||
if err := json.Unmarshal(regBytes, ®); err != nil { | ||
return nil, "", fmt.Errorf("unable to parse %s: %s", regPath, err) | ||
} | ||
if len(reg.ContainerName) == 0 { | ||
return nil, "", fmt.Errorf("unable to parse %s: \"containerName\" is not set", regPath) | ||
} | ||
if len(reg.PodUID) == 0 { | ||
return nil, "", fmt.Errorf("unable to parse %s: \"podUID\" is not set", regPath) | ||
} | ||
if len(reg.PodNamespace) == 0 { | ||
return nil, "", fmt.Errorf("unable to parse %s: \"podNamespace\" is not set", regPath) | ||
} | ||
if len(reg.PodName) == 0 { | ||
return nil, "", fmt.Errorf("unable to parse %s: \"podName\" is not set", regPath) | ||
} | ||
|
||
pod, ok := m.podManager.GetPodByName(reg.PodNamespace, reg.PodName) | ||
if !ok { | ||
return nil, "", fmt.Errorf("unable to process %s: pod %s/%s not found", regPath, reg.PodNamespace, reg.PodName) | ||
} | ||
if string(pod.UID) != reg.PodUID { | ||
return nil, "", fmt.Errorf("unable to process %s: pod %s/%s has unexpected UID", regPath, reg.PodNamespace, reg.PodName) | ||
} | ||
// make sure that reg.ContainerName exists in the pod | ||
for i := range pod.Spec.Containers { | ||
if pod.Spec.Containers[i].Name == reg.ContainerName { | ||
return pod, reg.ContainerName, nil | ||
} | ||
} | ||
return nil, "", fmt.Errorf("unable to process %s: pod %s/%s has no container named %q", regPath, reg.PodNamespace, reg.PodName, reg.ContainerName) | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
/* | ||
Copyright 2017 The Kubernetes 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 mountpod | ||
|
||
import ( | ||
"io/ioutil" | ||
"os" | ||
"path" | ||
"testing" | ||
|
||
"github.com/golang/glog" | ||
|
||
"k8s.io/api/core/v1" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
utiltesting "k8s.io/client-go/util/testing" | ||
"k8s.io/kubernetes/pkg/kubelet/configmap" | ||
kubepod "k8s.io/kubernetes/pkg/kubelet/pod" | ||
podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" | ||
"k8s.io/kubernetes/pkg/kubelet/secret" | ||
) | ||
|
||
func TestGetVolumeExec(t *testing.T) { | ||
// prepare PodManager | ||
pods := []*v1.Pod{ | ||
{ | ||
ObjectMeta: metav1.ObjectMeta{ | ||
UID: "12345678", | ||
Name: "foo", | ||
Namespace: "bar", | ||
}, | ||
Spec: v1.PodSpec{ | ||
Containers: []v1.Container{ | ||
{Name: "baz"}, | ||
}, | ||
}, | ||
}, | ||
} | ||
fakeSecretManager := secret.NewFakeManager() | ||
fakeConfigMapManager := configmap.NewFakeManager() | ||
podManager := kubepod.NewBasicPodManager( | ||
podtest.NewFakeMirrorClient(), fakeSecretManager, fakeConfigMapManager) | ||
podManager.SetPods(pods) | ||
|
||
// Prepare fake /var/lib/kubelet | ||
basePath, err := utiltesting.MkTmpdir("kubelet") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
defer os.RemoveAll(basePath) | ||
regPath := path.Join(basePath, "plugin-containers") | ||
|
||
mgr, err := NewManager(basePath, podManager) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
tests := []struct { | ||
name string | ||
json string | ||
expectError bool | ||
}{ | ||
{ | ||
"invalid json", | ||
"{{{}", | ||
true, | ||
}, | ||
{ | ||
"missing json", | ||
"", // this means no json file should be created | ||
false, | ||
}, | ||
{ | ||
"missing podNamespace", | ||
`{"podName": "foo", "podUID": "87654321", "containerName": "baz"}`, | ||
true, | ||
}, | ||
{ | ||
"missing podName", | ||
`{"podNamespace": "bar", "podUID": "87654321", "containerName": "baz"}`, | ||
true, | ||
}, | ||
{ | ||
"missing containerName", | ||
`{"podNamespace": "bar", "podName": "foo", "podUID": "87654321"}`, | ||
true, | ||
}, | ||
{ | ||
"missing podUID", | ||
`{"podNamespace": "bar", "podName": "foo", "containerName": "baz"}`, | ||
true, | ||
}, | ||
{ | ||
"missing pod", | ||
`{"podNamespace": "bar", "podName": "non-existing-pod", "podUID": "12345678", "containerName": "baz"}`, | ||
true, | ||
}, | ||
{ | ||
"invalid uid", | ||
`{"podNamespace": "bar", "podName": "foo", "podUID": "87654321", "containerName": "baz"}`, | ||
true, | ||
}, | ||
{ | ||
"invalid container", | ||
`{"podNamespace": "bar", "podName": "foo", "podUID": "12345678", "containerName": "invalid"}`, | ||
true, | ||
}, | ||
{ | ||
"valid pod", | ||
`{"podNamespace": "bar", "podName": "foo", "podUID": "12345678", "containerName": "baz"}`, | ||
false, | ||
}, | ||
} | ||
for _, test := range tests { | ||
p := path.Join(regPath, "kubernetes.io~glusterfs.json") | ||
if len(test.json) > 0 { | ||
if err := ioutil.WriteFile(p, []byte(test.json), 0600); err != nil { | ||
t.Errorf("test %q: error writing %s: %v", test.name, p, err) | ||
continue | ||
} | ||
} else { | ||
// "" means no JSON file | ||
os.Remove(p) | ||
} | ||
pod, container, err := mgr.GetMountPod("kubernetes.io/glusterfs") | ||
if err != nil { | ||
glog.V(5).Infof("test %q returned error %s", test.name, err) | ||
} | ||
if err == nil && test.expectError { | ||
t.Errorf("test %q: expected error, got none", test.name) | ||
} | ||
if err != nil && !test.expectError { | ||
t.Errorf("test %q: unexpected error: %v", test.name, err) | ||
} | ||
|
||
if err == nil { | ||
// Pod must be returned when the json file was not empty | ||
if pod == nil && len(test.json) != 0 { | ||
t.Errorf("test %q: expected exec, got nil", test.name) | ||
} | ||
// Both pod and container must be returned | ||
if pod != nil && len(container) == 0 { | ||
t.Errorf("test %q: expected container name, got %q", test.name, container) | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this will be OK, but double check that this works with static/mirror pods.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Static pod gets a different UID via dawnward API than it's in the API server :-(
Can we require that pods with mount utilities are not static?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Scratch the previous comment. Pod indeed gets different UID via downward API than it's in the API server, however kubelet sees the right ("downward") UID in this check and everything works.