diff --git a/cmd/sshjump/main.go b/cmd/sshjump/main.go index ad2bcbd..f2d46de 100644 --- a/cmd/sshjump/main.go +++ b/cmd/sshjump/main.go @@ -44,7 +44,7 @@ type EnvConfig struct { var ( grpcHealthServer *grpc.Server - sshServer *ssh.Server + sshServer *Server httpMetricsServer *http.Server ) @@ -101,10 +101,10 @@ func main() { os.Exit(1) } - s := NewServer(logger, healthServer, signer, keys, clientset) + sshServer = NewServer(logger, healthServer, signer, keys, clientset) // start watching for config change - if err := s.StartWatchConfig(ctx, envCfg.ConfigPath); err != nil { + if err := sshServer.StartWatchConfig(ctx, envCfg.ConfigPath); err != nil { logger.Error("failed to start watch config", "error", err) os.Exit(1) } @@ -116,7 +116,7 @@ func main() { // ssh server g.Go(func() error { - return startSSHServer(logger, envCfg, s) + return startSSHServer(logger, envCfg, sshServer) }) select { @@ -147,7 +147,7 @@ func main() { grpcHealthServer.GracefulStop() } - s.StopWatchConfig() + sshServer.StopWatchConfig() err = g.Wait() if err != nil { diff --git a/helm/templates/tcproute.yaml b/helm/templates/tcproute.yaml index d6484aa..57090c4 100644 --- a/helm/templates/tcproute.yaml +++ b/helm/templates/tcproute.yaml @@ -9,7 +9,7 @@ spec: parentRefs: - group: gateway.networking.k8s.io kind: Gateway - name: {{ .Values.tcpRoute.gatewayName }} + name: {{ .Values.tcpRoute.gatewayName }} namespace: {{ .Values.tcpRoute.gatewayNamespace }} rules: - backendRefs: