chore: change api agteway server context

Signed-off-by: Alessandro Yuichi Okimoto <yuichijpn@gmail.com>

Author: cre8ivejp

manifests/bucketeer/charts/api/templates/deployment.yaml

@@ -184,16 +184,7 @@ spec:
                   - /bin/sh
                   - -c
                   - |
-                    admin_port={{ .Values.envoy.adminPort }}
-                    max_wait=60
-
-                    # Wait for active requests to drain
-                    for i in $(seq 1 "$max_wait"); do
-                      active=$(wget -q -O- "http://localhost:${admin_port}/stats" 2>/dev/null | grep "http.ingress_http.downstream_rq_active" | awk '{print $2}' || echo "0")
-                      [ -z "$active" ] && active=0
-                      [ "$active" -eq 0 ] && break
-                      sleep 1
-                    done
+                    sleep 60
                     exit 0
           command: ["envoy"]
           args:

pkg/api/cmd/server.go

@@ -388,7 +388,7 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 	if err != nil {
 		return err
 	}
-	defer auditLogClient.Close()
+	defer autoOpsClient.Close()
 
 	tagClient, err := tagclient.NewClient(*s.tagService, *s.certPath,
 		client.WithPerRPCCredentials(creds),
@@ -502,7 +502,7 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 	// We don't check the Redis health status because if the check fails,
 	// the Kubernetes will restart the container and it might cause internal errors.
 	// Use a dedicated context so we can stop the health checker goroutine cleanly during shutdown
-	healthCheckCtx, healthCheckCancel := context.WithCancel(ctx)
+	healthCheckCtx, healthCheckCancel := context.WithCancel(context.Background())
 	defer healthCheckCancel() // Ensure cleanup on all paths (including early returns)
 
 	healthChecker := health.NewGrpcChecker(
@@ -545,7 +545,9 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 		return fmt.Errorf("failed to create API gateway: %v", err)
 	}
 
-	if err := apiGateway.Start(ctx, gatewayHandler); err != nil {
+	serverCtx, serverCtxCancel := context.WithCancel(context.Background())
+	defer serverCtxCancel()
+	if err := apiGateway.Start(serverCtx, gatewayHandler); err != nil {
 		return fmt.Errorf("failed to start API gateway: %v", err)
 	}
 
@@ -589,8 +591,6 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 			zap.Duration("wait_before_unready", waitBeforeUnready))
 		time.Sleep(waitBeforeUnready)
 
-		// Cancel the health checker goroutines to prevent connection errors during shutdown
-		healthCheckCancel()
 		// Mark as unhealthy so readiness probes fail
 		// This ensures Kubernetes readiness probe fails on next check,
 		// preventing new traffic from being routed to this pod.
@@ -627,6 +627,10 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 		// Now it's safe to stop the gRPC server (no more HTTP→gRPC calls)
 		server.Stop(grpcStopTimeout)
 
+		// Cancel goroutines
+		healthCheckCancel()
+		serverCtxCancel()
+
 		// Close clients
 		// These are fast cleanup operations that can run asynchronously.
 		go goalPublisher.Stop()