Skip to content

Commit

Permalink
Merge 0ff7cd6 into backport/feature/graceful-startup/directly-moral-g…
Browse files Browse the repository at this point in the history
…uppy
  • Loading branch information
hc-github-team-consul-core authored Apr 9, 2024
2 parents a0cb545 + 0ff7cd6 commit 927d952
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -415,19 +415,19 @@ func TestLifecycleConfig_GracefulStartupPath(t *testing.T) {
return pod
},
LifecycleConfig: Config{
DefaultGracefulStartupPath: "/quit",
DefaultGracefulStartupPath: "/start",
},
Expected: "/quit",
Expected: "/start",
Err: "",
},
{
Name: "Sidecar proxy lifecycle graceful port set via annotation",
Name: "Sidecar proxy lifecycle graceful startup path set via annotation",
Pod: func(pod *corev1.Pod) *corev1.Pod {
pod.Annotations[constants.AnnotationSidecarProxyLifecycleGracefulStartupPath] = "/custom-startup-path"
return pod
},
LifecycleConfig: Config{
DefaultGracefulStartupPath: "/quit",
DefaultGracefulStartupPath: "/start",
},
Expected: "/custom-startup-path",
Err: "",
Expand Down

0 comments on commit 927d952

Please sign in to comment.