Skip to content
This repository was archived by the owner on Apr 29, 2020. It is now read-only.

Commit 52fb8a0

Browse files
committed
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
1 parent 47ce28a commit 52fb8a0

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

pkg/hooks/hook_env.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,15 @@ func (h *HookEnv) ExitUnlessEvent(types ...HookType) HookType {
130130
return HookType("") // never reached
131131
}
132132

133-
func (h *HookEnv) PodUniqueKey() (types.PodUniqueKey, error) {
133+
func (h *HookEnv) PodUniqueKey() types.PodUniqueKey {
134134
podUniqueKey := os.Getenv(HookedPodUniqueKeyEnvVar)
135-
if podUniqueKey == "" {
136-
return "", util.Errorf("%s environment variable is not set", HookedPodUniqueKeyEnvVar)
137-
}
138-
return types.PodUniqueKey(podUniqueKey), nil
135+
136+
// don't check for blank because it often IS blank (for "legacy" pods)
137+
return types.PodUniqueKey(podUniqueKey)
139138
}
140139

141140
func (h *HookEnv) PodUniqueName() (string, error) {
142-
podUniqueKey, err := h.PodUniqueKey()
143-
if err != nil {
144-
return "", err
145-
}
141+
podUniqueKey := h.PodUniqueKey()
146142

147143
podID, err := h.PodID()
148144
if err != nil {

0 commit comments

Comments
 (0)