From 48d3d604af0fcac98a3d32c06b016e04883ebd99 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 2 Jun 2015 09:48:29 -0700 Subject: [PATCH] fix --- cmd/integration/v1-controller.json | 24 ++++++++++++++++++++++++ pkg/kubelet/config/http_test.go | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 cmd/integration/v1-controller.json diff --git a/cmd/integration/v1-controller.json b/cmd/integration/v1-controller.json new file mode 100644 index 00000000000..20a94b62614 --- /dev/null +++ b/cmd/integration/v1-controller.json @@ -0,0 +1,24 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1", + "metadata": { + "name": "nginx-controller", + "labels": {"name": "nginx"} + }, + "spec": { + "replicas": 2, + "selector": {"name": "nginx"}, + "template": { + "metadata": { + "labels": {"name": "nginx"} + }, + "spec": { + "containers": [{ + "name": "nginx", + "image": "nginx", + "ports": [{"containerPort": 80}] + }] + } + } + } +} diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 5a92ab75815..26309fdf279 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -160,7 +160,6 @@ func TestExtractPodsFromHTTP(t *testing.T) { Image: "foo", TerminationMessagePath: "/dev/termination-log", ImagePullPolicy: "Always", - //SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults() }}, }, }),