github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Make kubelet's file source go through conversion

Browse Source 
See comments for details.  Same problem exists in HTTP source, but I want to
float this for review first.
This commit is contained in:
Tim Hockin 2015-01-21 17:11:56 -08:00
parent ffb2b62726
commit 4ff2865cd1
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/config/file.go
View File

@ -29,6 +29,7 @@ import (
"time" "time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types" "github.com/GoogleCloudPlatform/kubernetes/pkg/types"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@ -145,13 +146,26 @@ func extractFromFile(filename string) (api.BoundPod, error) {
return pod, err return pod, err
} }
manifest := &api.ContainerManifest{}
// TODO: use api.Scheme.DecodeInto // TODO: use api.Scheme.DecodeInto
if err := yaml.Unmarshal(data, manifest); err != nil { // This is awful. DecodeInto() expects to find an APIObject, which
// Manifest is not. We keep reading manifest for now for compat, but
// we will eventually change it to read Pod (at which point this all
// becomes nicer). Until then, we assert that the ContainerManifest
// structure on disk is always v1beta1. Read that, convert it to a
// "current" ContainerManifest (should be ~identical), then convert
// that to a BoundPod (which is a well-understood conversion). This
// avoids writing a v1beta1.ContainerManifest -> api.BoundPod
// conversion which would be identical to the api.ContainerManifest ->
// api.BoundPod conversion.
oldManifest := &v1beta1.ContainerManifest{}
if err := yaml.Unmarshal(data, oldManifest); err != nil {
return pod, fmt.Errorf("can't unmarshal file %q: %v", filename, err) return pod, fmt.Errorf("can't unmarshal file %q: %v", filename, err)
} }
newManifest := &api.ContainerManifest{}
if err := api.Scheme.Convert(manifest, &pod); err != nil { if err := api.Scheme.Convert(oldManifest, newManifest); err != nil {
return pod, fmt.Errorf("can't convert pod from file %q: %v", filename, err)
}
if err := api.Scheme.Convert(newManifest, &pod); err != nil {
return pod, fmt.Errorf("can't convert pod from file %q: %v", filename, err) return pod, fmt.Errorf("can't convert pod from file %q: %v", filename, err)
} }

25
pkg/kubelet/config/file_test.go
View File

@ -26,27 +26,28 @@ import (
"time" "time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types" "github.com/GoogleCloudPlatform/kubernetes/pkg/types"
) )
func ExampleManifestAndPod(id string) (api.ContainerManifest, api.BoundPod) { func ExampleManifestAndPod(id string) (v1beta1.ContainerManifest, api.BoundPod) {
manifest := api.ContainerManifest{ manifest := v1beta1.ContainerManifest{
ID: id, ID: id,
UUID: types.UID(id), UUID: types.UID(id),
Containers: []api.Container{ Containers: []v1beta1.Container{
{ {
Name: "c" + id, Name: "c" + id,
Image: "foo", Image: "foo",
TerminationMessagePath: "/somepath", TerminationMessagePath: "/somepath",
}, },
}, },
Volumes: []api.Volume{ Volumes: []v1beta1.Volume{
{ {
Name: "host-dir", Name: "host-dir",
Source: api.VolumeSource{ Source: v1beta1.VolumeSource{
HostPath: &api.HostPath{"/dir/path"}, HostDir: &v1beta1.HostPath{"/dir/path"},
}, },
}, },
}, },
@ -120,7 +121,7 @@ func TestReadFromFile(t *testing.T) {
"version": "v1beta1", "version": "v1beta1",
"uuid": "12345", "uuid": "12345",
"id": "test", "id": "test",
"containers": [{ "image": "test/image" }] "containers": [{ "image": "test/image", imagePullPolicy: "PullAlways"}]
}`) }`)
defer os.Remove(file.Name()) defer os.Remove(file.Name())
@ -137,7 +138,13 @@ func TestReadFromFile(t *testing.T) {
SelfLink: "", SelfLink: "",
}, },
Spec: api.PodSpec{ Spec: api.PodSpec{
Containers: []api.Container{{Image: "test/image", TerminationMessagePath: "/dev/termination-log"}}, Containers: []api.Container{
{
Image: "test/image",
TerminationMessagePath: "/dev/termination-log",
ImagePullPolicy: api.PullAlways,
},
},
}, },
}) })
@ -224,7 +231,7 @@ func TestExtractFromDir(t *testing.T) {
manifest, expectedPod := ExampleManifestAndPod("1") manifest, expectedPod := ExampleManifestAndPod("1")
manifest2, expectedPod2 := ExampleManifestAndPod("2") manifest2, expectedPod2 := ExampleManifestAndPod("2")
manifests := []api.ContainerManifest{manifest, manifest2} manifests := []v1beta1.ContainerManifest{manifest, manifest2}
pods := []api.BoundPod{expectedPod, expectedPod2} pods := []api.BoundPod{expectedPod, expectedPod2}
files := make([]*os.File, len(manifests)) files := make([]*os.File, len(manifests))