From adeb45f79a1627b30e578c0b32a9e0bfc9d9435c Mon Sep 17 00:00:00 2001 From: Michael Puncel Date: Thu, 24 May 2018 13:13:48 -0400 Subject: [PATCH] hook env: don't error if POD_UNIQUE_KEY is empty POD_UNIQUE_KEY is empty for most pods, so it doesn't make sense to return an error if it's empty, just return an empty string --- pkg/hooks/hook_env.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkg/hooks/hook_env.go b/pkg/hooks/hook_env.go index 4f00e8fe6..a7717802b 100644 --- a/pkg/hooks/hook_env.go +++ b/pkg/hooks/hook_env.go @@ -134,19 +134,15 @@ func (h *HookEnv) ExitUnlessEvent(types ...HookType) HookType { return HookType("") // never reached } -func (h *HookEnv) PodUniqueKey() (types.PodUniqueKey, error) { +func (h *HookEnv) PodUniqueKey() types.PodUniqueKey { podUniqueKey := os.Getenv(HookedPodUniqueKeyEnvVar) - if podUniqueKey == "" { - return "", util.Errorf("%s environment variable is not set", HookedPodUniqueKeyEnvVar) - } - return types.PodUniqueKey(podUniqueKey), nil + + // don't check for blank because it often IS blank (for "legacy" pods) + return types.PodUniqueKey(podUniqueKey) } func (h *HookEnv) PodUniqueName() (string, error) { - podUniqueKey, err := h.PodUniqueKey() - if err != nil { - return "", err - } + podUniqueKey := h.PodUniqueKey() podID, err := h.PodID() if err != nil {