minor: added extra annotation to connect inject (#7)

team-telnyx · Jun 21, 2023 · f666b73 · f666b73
1 parent f79960b
commit f666b73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/control-plane/connect-inject/constants/annotations_and_labels.go b/control-plane/connect-inject/constants/annotations_and_labels.go
@@ -128,6 +128,9 @@ const (
 	// passed via the -envoy-extra-args flag.
 	AnnotationEnvoyExtraArgs = "consul.hashicorp.com/envoy-extra-args"
 
+	// annotationSidecarProxyPreStopDelay to add a pre-stop delay to the sidecar proxy.
+	AnnotationSidecarProxyPreStopDelay = "consul.hashicorp.com/sidecar-proxy-prestop-delay"
+
 	// AnnotationConsulNamespace is the Consul namespace the service is registered into.
 	AnnotationConsulNamespace = "consul.hashicorp.com/consul-namespace"
 

diff --git a/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go b/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go
@@ -110,6 +110,19 @@ func (w *MeshWebhook) consulDataplaneSidecar(namespace corev1.Namespace, pod cor
 		container.VolumeMounts = append(container.VolumeMounts, saTokenVolumeMount)
 	}
 
+	// Prestop hook
+	if _, ok := pod.Annotations[constants.AnnotationSidecarProxyPreStopDelay]; ok {
+		preStopHook := &corev1.Lifecycle{
+			PreStop: &corev1.LifecycleHandler {
+				Exec: &corev1.ExecAction {
+					Command: []string{
+								  "/bin/sh",
+								  "-c",
+							"sleep " + pod.Annotations[constants.AnnotationSidecarProxyPreStopDelay],
+			}}}}
+		container.Lifecycle = preStopHook
+	}
+
 	if useProxyHealthCheck(pod) {
 		// Configure the Readiness Address for the proxy's health check to be the Pod IP.
 		container.Env = append(container.Env, corev1.EnvVar{