Move prepare_controllers alongside Concierge server code

This commit is contained in:
Joshua Casey
2024-12-03 12:20:45 -06:00
committed by Joshua Casey
parent 1571859d67
commit 8ea393e3de
2 changed files with 3 additions and 6 deletions
@@ -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"
+2 -3
View File
@@ -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,