From 4c3ec907ab89c2dbaa830d771563be8e5e16763e Mon Sep 17 00:00:00 2001
From: Brian Downs <brian.downs@gmail.com>
Date: Fri, 4 Sep 2020 09:30:36 -0700
Subject: [PATCH] remove k8s daemon config from setup hook in favor of specific
 fields from the config (#2206)

Signed-off-by: Brian Downs <brian.downs@gmail.com>
---
 pkg/cli/cmds/server.go | 3 +--
 pkg/server/server.go   | 2 +-
 pkg/server/types.go    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index 367b8e3d60..124ea5244c 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -3,7 +3,6 @@ package cmds
 import (
 	"context"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/rancher/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
@@ -60,7 +59,7 @@ type Server struct {
 	ClusterReset             bool
 	ClusterResetRestorePath  string
 	EncryptSecrets           bool
-	StartupHooks             []func(context.Context, config.Control) error
+	StartupHooks             []func(context.Context, <-chan struct{}, string) error
 	EtcdDisableSnapshots     bool
 	EtcdSnapshotDir          string
 	EtcdSnapshotCron         string
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 89b7bb05fe..f0520e8903 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -61,7 +61,7 @@ func StartServer(ctx context.Context, config *Config) error {
 	}
 
 	for _, hook := range config.StartupHooks {
-		if err := hook(ctx, config.ControlConfig); err != nil {
+		if err := hook(ctx, config.ControlConfig.Runtime.APIServerReady, config.ControlConfig.Runtime.KubeConfigAdmin); err != nil {
 			return errors.Wrap(err, "startup hook")
 		}
 	}
diff --git a/pkg/server/types.go b/pkg/server/types.go
index 69f96389e1..d7b84ed3a2 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -12,5 +12,5 @@ type Config struct {
 	ControlConfig    config.Control
 	Rootless         bool
 	SupervisorPort   int
-	StartupHooks     []func(context.Context, config.Control) error
+	StartupHooks     []func(context.Context, <-chan struct{}, string) error
 }