Slide 7
Slide 7 text
52c52
< Volume: &v1.Volume{VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}},
---
> Volume: &v1.Volume{VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{Medium: v1.StorageMediumMemory}}},
55a56,59
> func getPath(uid types.UID, volumeName string, host volume.VolumeHost) string {
> return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(configmapPluginName), volumeName)
> }
>
72,75c76
< return fmt.Sprintf(
< "%v/%v",
< spec.Name(),
< volumeSource.Name), nil
---
> return volumeSource.Name, nil
101c102
< volume.MetricsNil{},
---
> volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))),
117c118
< volume.MetricsNil{},
---
> volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volumeName, plugin.host))),
126c127,129
< configmap: &v1.configmapVolumeSource{},
---
> configmap: &v1.configmapVolumeSource{
> Name: volumeName,
> },
137c140
< volume.MetricsNil
---
> volume.MetricsProvider
143c146
< return sv.plugin.host.GetPodVolumeDir(sv.podUID, strings.EscapeQualifiedNameForDisk(configmapPluginName), sv.volumeName)
---
> return getPath(sv.podUID, sv.volumeName, sv.plugin.host)
206c209
< len(configmap.Data)+len(configmap.BinaryData),
---
> len(configmap.Data),
265c268
< payload := make(map[string]volumeutil.FileProjection, (len(configmap.Data) + len(configmap.BinaryData)))
---
> payload := make(map[string]volumeutil.FileProjection, len(configmap.Data))
274,278d276
< for name, data := range configmap.BinaryData {
< fileProjection.Data = data
< fileProjection.Mode = *defaultMode
< payload[name] = fileProjection
< }
281,285c279,280
< if stringData, ok := configmap.Data[ktp.Key]; ok {
< fileProjection.Data = []byte(stringData)
< } else if binaryData, ok := configmap.BinaryData[ktp.Key]; ok {
< fileProjection.Data = binaryData
< } else {
---
> content, ok := configmap.Data[ktp.Key]
> if !ok {
289c284,286
< return nil, fmt.Errorf("configmap references non-existent config key: %s", ktp.Key)
---
> errMsg := "references non-existent configmap key"
> glog.Errorf(errMsg)
> return nil, fmt.Errorf(errMsg)
291a289
> fileProjection.Data = []byte(content)
300d297
<
309,311d305
< for _, value := range configmap.BinaryData {
< totalSize += len(value)
< }
˞EJGG͕গͳ͘ͳΔΑ͏ʹগ͍ͬͯ͠͡·͢