From f2bf13a5acf3acc678e0571a530f845bae54955e Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Mon, 13 Jun 2016 09:40:17 -0700 Subject: [PATCH 1/2] rkt: Treat pod container cgroup as the infra container. --- pkg/kubelet/rkt/rkt.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 4c5c3b08e6f..3e16baf0127 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -46,6 +46,7 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/leaky" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/kubelet/network/hairpin" @@ -618,6 +619,7 @@ func (r *Runtime) makePodManifest(pod *api.Pod, podIP string, pullSecrets []api. manifest.Annotations.Set(*appctypes.MustACIdentifier(types.KubernetesPodUIDLabel), string(pod.UID)) manifest.Annotations.Set(*appctypes.MustACIdentifier(types.KubernetesPodNameLabel), pod.Name) manifest.Annotations.Set(*appctypes.MustACIdentifier(types.KubernetesPodNamespaceLabel), pod.Namespace) + manifest.Annotations.Set(*appctypes.MustACIdentifier(types.KubernetesContainerNameLabel), leaky.PodInfraContainerName) manifest.Annotations.Set(*appctypes.MustACIdentifier(k8sRktRestartCountAnno), strconv.Itoa(restartCount)) if stage1Name, ok := pod.Annotations[k8sRktStage1NameAnno]; ok { requiresPrivileged = true From 03ee60c81097792565ffc7ec96f4a7e7bc7bb428 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Mon, 13 Jun 2016 09:27:28 -0700 Subject: [PATCH 2/2] rkt: Updated the TestMakePodManifestAnnotations(). --- pkg/kubelet/rkt/rkt_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go index 99a13c77305..a9216ceb3c4 100644 --- a/pkg/kubelet/rkt/rkt_test.go +++ b/pkg/kubelet/rkt/rkt_test.go @@ -1754,6 +1754,10 @@ func TestMakePodManifestAnnotations(t *testing.T) { }, out: &appcschema.PodManifest{ Annotations: []appctypes.Annotation{ + { + Name: "io.kubernetes.container.name", + Value: "POD", + }, { Name: appctypes.ACIdentifier(k8sRktStage1NameAnno), Value: "stage1-override-img", @@ -1787,11 +1791,11 @@ func TestMakePodManifestAnnotations(t *testing.T) { hint := fmt.Sprintf("case #%d", i) result, err := r.makePodManifest(testCase.in, "", []api.Secret{}) - assert.Equal(t, err, testCase.outerr, hint) + assert.Equal(t, testCase.outerr, err, hint) if err == nil { sort.Sort(annotationsByName(result.Annotations)) sort.Sort(annotationsByName(testCase.out.Annotations)) - assert.Equal(t, result.Annotations, testCase.out.Annotations, hint) + assert.Equal(t, testCase.out.Annotations, result.Annotations, hint) } } }