From 8ea393e3dee0b6f121d8da5b02190719246464d9 Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Wed, 31 Jul 2024 15:17:00 -0500 Subject: [PATCH] Move prepare_controllers alongside Concierge server code --- .../server}/prepare_controllers.go | 4 +--- internal/concierge/server/server.go | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) rename internal/{controllermanager => concierge/server}/prepare_controllers.go (98%) diff --git a/internal/controllermanager/prepare_controllers.go b/internal/concierge/server/prepare_controllers.go similarity index 98% rename from internal/controllermanager/prepare_controllers.go rename to internal/concierge/server/prepare_controllers.go index b3aa5468c..5b5c9cf02 100644 --- a/internal/controllermanager/prepare_controllers.go +++ b/internal/concierge/server/prepare_controllers.go @@ -1,9 +1,7 @@ // Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Package controllermanager provides an entrypoint into running all of the controllers that run as -// a part of Pinniped. -package controllermanager +package server import ( "fmt" diff --git a/internal/concierge/server/server.go b/internal/concierge/server/server.go index 67629c6ab..cf829379c 100644 --- a/internal/concierge/server/server.go +++ b/internal/concierge/server/server.go @@ -32,7 +32,6 @@ import ( "go.pinniped.dev/internal/config/featuregates" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerinit" - "go.pinniped.dev/internal/controllermanager" "go.pinniped.dev/internal/crypto/ptls" "go.pinniped.dev/internal/downward" "go.pinniped.dev/internal/dynamiccert" @@ -152,8 +151,8 @@ func (a *App) runServer(ctx context.Context) error { // Prepare to start the controllers, but defer actually starting them until the // post start hook of the aggregated API server. - buildControllers, err := controllermanager.PrepareControllers( - &controllermanager.Config{ + buildControllers, err := PrepareControllers( + &Config{ ServerInstallationInfo: podInfo, APIGroupSuffix: *cfg.APIGroupSuffix, NamesConfig: &cfg.NamesConfig,