github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23368 from saad-ali/renameBuilderCleaner

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-26 13:01:25 -07:00
parent 3ec9f1e0a1 79012f6d53
commit 2205a30348
63 changed files with 877 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/design/secrets.md
View File

@@ -391,11 +391,11 @@ type Host interface {
The secret volume plugin will be responsible for:
1. Returning a `volume.Builder` implementation from `NewBuilder` that:
1. Returning a `volume.Mounter` implementation from `NewMounter` that:
1. Retrieves the secret data for the volume from the API server
2. Places the secret data onto the container's filesystem
3. Sets the correct security attributes for the volume based on the pod's `SecurityContext`
2. Returning a `volume.Cleaner` implementation from `NewClear` that cleans the volume from the
2. Returning a `volume.Unmounter` implementation from `NewUnmounter` that cleans the volume from the
container's filesystem
### Kubelet: Node-level secret storage

2
docs/proposals/selinux.md
View File

@@ -278,7 +278,7 @@ criteria to activate the kubelet SELinux label management for volumes are:
3. The `pod.Spec.SecurityContext.SELinuxOptions` field is set
4. The volume plugin supports SELinux label management
The `volume.Builder` interface should have a new method added that indicates whether the plugin
The `volume.Mounter` interface should have a new method added that indicates whether the plugin
supports SELinux label management:
```go

6
docs/proposals/volumes.md
View File

@@ -301,13 +301,13 @@ or read the `pod.Spec.SecurityContext.FSGroup` field.
### Volume changes
The `volume.Builder` interface should have a new method added that indicates whether the plugin
The `volume.Mounter` interface should have a new method added that indicates whether the plugin
supports ownership management:
```go
package volume
type Builder interface {
type Mounter interface {
// other methods omitted
// SupportsOwnershipManagement indicates that this volume supports having ownership
@@ -403,7 +403,7 @@ func (kl *Kubelet) mountExternalVolumes(pod *api.Pod) (kubecontainer.VolumeMap,
// Try to use a plugin for this volume.
internal := volume.NewSpecFromVolume(volSpec)
builder, err := kl.newVolumeBuilderFromPlugins(internal, pod, volume.VolumeOptions{RootContext: rootContext}, kl.mounter)
builder, err := kl.newVolumeMounterFromPlugins(internal, pod, volume.VolumeOptions{RootContext: rootContext}, kl.mounter)
if err != nil {
glog.Errorf("Could not create volume builder for pod %s: %v", pod.UID, err)
return nil, err