github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5807 from pmorie/secret_volume_ref

Browse Source 
Change secret volume plugin reference to name
This commit is contained in:
Tim Hockin
2015-03-24 14:18:35 -07:00
parent c1730989cb e40ba109a1
commit 064b7dec42
13 changed files with 96 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/volume/secret/secret.go
View File

@@ -63,7 +63,7 @@ func (plugin *secretPlugin) NewBuilder(spec *api.Volume, podRef *api.ObjectRefer
}
func (plugin *secretPlugin) newBuilderInternal(spec *api.Volume, podRef *api.ObjectReference) (volume.Builder, error) {
return &secretVolume{spec.Name, *podRef, plugin, spec.Secret.Target}, nil
return &secretVolume{spec.Name, *podRef, plugin, spec.Secret.SecretName}, nil
}
func (plugin *secretPlugin) NewCleaner(volName string, podUID types.UID) (volume.Cleaner, error) {
@@ -71,16 +71,16 @@ func (plugin *secretPlugin) NewCleaner(volName string, podUID types.UID) (volume
}
func (plugin *secretPlugin) newCleanerInternal(volName string, podUID types.UID) (volume.Cleaner, error) {
return &secretVolume{volName, api.ObjectReference{UID: podUID}, plugin, api.ObjectReference{}}, nil
return &secretVolume{volName, api.ObjectReference{UID: podUID}, plugin, ""}, nil
}
// secretVolume handles retrieving secrets from the API server
// and placing them into the volume on the host.
type secretVolume struct {
volName string
podRef api.ObjectReference
plugin *secretPlugin
secretRef api.ObjectReference
volName string
podRef api.ObjectReference
plugin *secretPlugin
secretName string
}
func (sv *secretVolume) SetUp() error {
@@ -110,9 +110,9 @@ func (sv *secretVolume) SetUpAt(dir string) error {
return fmt.Errorf("Cannot setup secret volume %v because kube client is not configured", sv)
}
secret, err := kubeClient.Secrets(sv.podRef.Namespace).Get(sv.secretRef.Name)
secret, err := kubeClient.Secrets(sv.podRef.Namespace).Get(sv.secretName)
if err != nil {
glog.Errorf("Couldn't get secret %v/%v", sv.secretRef.Namespace, sv.secretRef.Name)
glog.Errorf("Couldn't get secret %v/%v", sv.podRef.Namespace, sv.secretName)
return err
}

7
pkg/volume/secret/secret_test.go
View File

@@ -52,7 +52,7 @@ func TestCanSupport(t *testing.T) {
if plugin.Name() != secretPluginName {
t.Errorf("Wrong name: %s", plugin.Name())
}
if !plugin.CanSupport(&api.Volume{VolumeSource: api.VolumeSource{Secret: &api.SecretVolumeSource{Target: api.ObjectReference{}}}}) {
if !plugin.CanSupport(&api.Volume{VolumeSource: api.VolumeSource{Secret: &api.SecretVolumeSource{SecretName: ""}}}) {
t.Errorf("Expected true")
}
}
@@ -69,10 +69,7 @@ func TestPlugin(t *testing.T) {
Name: testVolumeName,
VolumeSource: api.VolumeSource{
Secret: &api.SecretVolumeSource{
Target: api.ObjectReference{
Namespace: testNamespace,
Name: testName,
},
SecretName: testName,
},
},
}