chore(*): use waitgroup

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>

app/kuma-dp/pkg/dataplane/dnsserver/dnsserver.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os/exec"
 	"regexp"
+	"sync"
 	"text/template"
 
 	"github.com/pkg/errors"
@@ -25,7 +26,7 @@ type DNSServer struct {
 	opts *Opts
 	path string
 
-	finalizer component.Finalizer
+	wg sync.WaitGroup
 }
 
 var _ component.GracefulComponent = &DNSServer{}
@@ -92,7 +93,7 @@ func (s *DNSServer) NeedLeaderElection() bool {
 }
 
 func (s *DNSServer) Start(stop <-chan struct{}) error {
-	s.finalizer.Running()
+	s.wg.Add(1)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -148,7 +149,7 @@ func (s *DNSServer) Start(stop <-chan struct{}) error {
 		done <- command.Wait()
 		// Component should only be considered done after CoreDNS exists.
 		// Otherwise, we may not propagate SIGTERM on time.
-		s.finalizer.Done()
+		s.wg.Done()
 	}()
 
 	select {
@@ -172,5 +173,5 @@ func (s *DNSServer) Start(stop <-chan struct{}) error {
 }
 
 func (s *DNSServer) WaitForDone() {
-	s.finalizer.WaitForDone()
+	s.wg.Wait()
 }

app/kuma-dp/pkg/dataplane/envoy/envoy.go

@@ -10,6 +10,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	envoy_bootstrap_v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
@@ -62,7 +63,7 @@ var _ component.GracefulComponent = &Envoy{}
 type Envoy struct {
 	opts Opts
 
-	finalizer component.Finalizer
+	wg sync.WaitGroup
 }
 
 type EnvoyVersion struct {
@@ -84,7 +85,7 @@ func lookupEnvoyPath(configuredPath string) (string, error) {
 }
 
 func (e *Envoy) Start(stop <-chan struct{}) error {
-	e.finalizer.Running()
+	e.wg.Add(1)
 
 	configFile, err := GenerateBootstrapFile(e.opts.Config.DataplaneRuntime, e.opts.BootstrapConfig)
 	if err != nil {
@@ -143,7 +144,7 @@ func (e *Envoy) Start(stop <-chan struct{}) error {
 		done <- command.Wait()
 		// Component should only be considered done after Envoy exists.
 		// Otherwise, we may not propagate SIGTERM on time.
-		e.finalizer.Done()
+		e.wg.Done()
 	}()
 
 	select {
@@ -166,7 +167,7 @@ func (e *Envoy) Start(stop <-chan struct{}) error {
 }
 
 func (e *Envoy) WaitForDone() {
-	e.finalizer.WaitForDone()
+	e.wg.Wait()
 }
 
 func (e *Envoy) DrainConnections() error {