Skip to content

K
k3s
Commit a2086d41 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #20816 from yifan-gu/termination_log_anno

Auto commit by PR queue bot
parents b0560cba b14ac948
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/kubelet/rkt/rkt.go
View file @ a2086d41
...@@ -77,9 +77,9 @@ const ( ...@@ -77,9 +77,9 @@ const (
k8sRktNamespaceAnno = "rkt.kubernetes.io/namespace" k8sRktNamespaceAnno = "rkt.kubernetes.io/namespace"
//TODO: remove the creation time annotation once this is closed: https://github.com/coreos/rkt/issues/1789 //TODO: remove the creation time annotation once this is closed: https://github.com/coreos/rkt/issues/1789
k8sRktCreationTimeAnno = "rkt.kubernetes.io/created" k8sRktCreationTimeAnno = "rkt.kubernetes.io/created"
k8sRktContainerHashAnno = "rkt.kubernetes.io/containerhash" k8sRktContainerHashAnno = "rkt.kubernetes.io/container-hash"
k8sRktRestartCountAnno = "rkt.kubernetes.io/restartcount" k8sRktRestartCountAnno = "rkt.kubernetes.io/restart-count"
k8sRktTerminationMessagePathAnno = "rkt.kubernetes.io/terminationMessagePath" k8sRktTerminationMessagePathAnno = "rkt.kubernetes.io/termination-message-path"
dockerPrefix = "docker://" dockerPrefix = "docker://"
authDir = "auth.d" authDir = "auth.d"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment