From 8e5c14f1bfd3bf652564831e10189e80c81f248e Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Tue, 9 Feb 2016 00:13:08 +0800 Subject: [PATCH 1/2] rkt: Annotation key should not container capital letters. --- pkg/kubelet/rkt/rkt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 0b5067d1a95..bbebfd2bb9a 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -79,7 +79,7 @@ const ( k8sRktCreationTimeAnno = "rkt.kubernetes.io/created" k8sRktContainerHashAnno = "rkt.kubernetes.io/containerhash" k8sRktRestartCountAnno = "rkt.kubernetes.io/restartcount" - k8sRktTerminationMessagePathAnno = "rkt.kubernetes.io/terminationMessagePath" + k8sRktTerminationMessagePathAnno = "rkt.kubernetes.io/termination-message-path" dockerPrefix = "docker://" authDir = "auth.d" From b14ac9481a79d96dd695eeccaf4e9ff3673deae2 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Tue, 9 Feb 2016 14:50:25 +0800 Subject: [PATCH 2/2] rkt: Add hyphen in the annotation key. --- pkg/kubelet/rkt/rkt.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index bbebfd2bb9a..dbb96df53b8 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -77,8 +77,8 @@ const ( k8sRktNamespaceAnno = "rkt.kubernetes.io/namespace" //TODO: remove the creation time annotation once this is closed: https://github.com/coreos/rkt/issues/1789 k8sRktCreationTimeAnno = "rkt.kubernetes.io/created" - k8sRktContainerHashAnno = "rkt.kubernetes.io/containerhash" - k8sRktRestartCountAnno = "rkt.kubernetes.io/restartcount" + k8sRktContainerHashAnno = "rkt.kubernetes.io/container-hash" + k8sRktRestartCountAnno = "rkt.kubernetes.io/restart-count" k8sRktTerminationMessagePathAnno = "rkt.kubernetes.io/termination-message-path" dockerPrefix = "docker://"