From 79b4dc2c810291860640ceb2f76c8dfa16a228da Mon Sep 17 00:00:00 2001
From: Luther Monson <luther.monson@gmail.com>
Date: Mon, 19 Jul 2021 11:35:01 -0700
Subject: [PATCH] Revert "Adding support for waitgroup to the Startuphooks
 (#3654) (#3658)" (#3664)

This reverts commit 8a81349b2f62b38945c271da48cf4625af45a536.
---
 pkg/cli/cmds/server.go | 4 +---
 pkg/server/server.go   | 6 +-----
 pkg/server/types.go    | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index 47964b5aac..916944f2cd 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -2,7 +2,6 @@ package cmds
 
 import (
 	"context"
-	"sync"
 
 	"github.com/rancher/k3s/pkg/version"
 	"github.com/urfave/cli"
@@ -63,8 +62,7 @@ type Server struct {
 	ClusterReset             bool
 	ClusterResetRestorePath  string
 	EncryptSecrets           bool
-	SystemDefaultRegistry    string
-	StartupHooks             []func(context.Context, *sync.WaitGroup, <-chan struct{}, string) error
+	StartupHooks             []func(context.Context, <-chan struct{}, string) error
 	EtcdSnapshotName         string
 	EtcdDisableSnapshots     bool
 	EtcdSnapshotDir          string
diff --git a/pkg/server/server.go b/pkg/server/server.go
index eda5f3fabe..467b6b5dd0 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -69,10 +68,8 @@ func StartServer(ctx context.Context, config *Config) error {
 		return errors.Wrap(err, "starting tls server")
 	}
 
-	config.StartupHooksWg = &sync.WaitGroup{}
-	config.StartupHooksWg.Add(len(config.StartupHooks))
 	for _, hook := range config.StartupHooks {
-		if err := hook(ctx, config.StartupHooksWg, config.ControlConfig.Runtime.APIServerReady, config.ControlConfig.Runtime.KubeConfigAdmin); err != nil {
+		if err := hook(ctx, config.ControlConfig.Runtime.APIServerReady, config.ControlConfig.Runtime.KubeConfigAdmin); err != nil {
 			return errors.Wrap(err, "startup hook")
 		}
 	}
@@ -130,7 +127,6 @@ func runControllers(ctx context.Context, config *Config) error {
 		return err
 	}
 
-	config.StartupHooksWg.Wait()
 	if err := stageFiles(ctx, sc, controlConfig); err != nil {
 		return err
 	}
diff --git a/pkg/server/types.go b/pkg/server/types.go
index 998b1996ff..eb1914549d 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"sync"
 
 	"github.com/rancher/k3s/pkg/daemons/config"
 )
@@ -13,8 +12,7 @@ type Config struct {
 	ControlConfig     config.Control
 	Rootless          bool
 	SupervisorPort    int
-	StartupHooks      []func(context.Context, *sync.WaitGroup, <-chan struct{}, string) error
-	StartupHooksWg    *sync.WaitGroup
+	StartupHooks      []func(context.Context, <-chan struct{}, string) error
 	LeaderControllers CustomControllers
 	Controllers       CustomControllers
 }