weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add comments and improve variable names

Browse Source 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2023-08-18 11:39:16 +02:00
parent f1b895247e
commit 48cc19bee3
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/controller/app/start.go
View File

@ -116,14 +116,22 @@ to renew certificates at an appropriate time before expiry.`,
return cmd
}
// loadConfigFromFile loads the configuration from the provided config file
// path, if one is provided. After loading the config file, the flags are
// re-parsed to ensure that any flags provided to the command line override
// those provided in the config file.
// The newConfigHook is called when the options have been loaded from the
// flags (but not yet the config file) and is re-called after the config file
// has been loaded. This allows us to use the logging options and feature flags
// set by the flags to log errors when loading the config file.
func loadConfigFromFile(
cmd *cobra.Command,
allArgs []string,
configFilePath string,
cfg *config.ControllerConfiguration,
fn func() error,
newConfigHook func() error,
) error {
if err := fn(); err != nil {
if err := newConfigHook(); err != nil {
return err
}
@ -155,7 +163,7 @@ func loadConfigFromFile(
return fmt.Errorf("failed to re-parse flags: %w", err)
}
if err := fn(); err != nil {
if err := newConfigHook(); err != nil {
return err
}
}

14
cmd/webhook/app/webhook.go
View File

@ -111,14 +111,22 @@ functionality for cert-manager.`,
return cmd
}
// loadConfigFromFile loads the configuration from the provided config file
// path, if one is provided. After loading the config file, the flags are
// re-parsed to ensure that any flags provided to the command line override
// those provided in the config file.
// The newConfigHook is called when the options have been loaded from the
// flags (but not yet the config file) and is re-called after the config file
// has been loaded. This allows us to use the logging options and feature flags
// set by the flags to log errors when loading the config file.
func loadConfigFromFile(
cmd *cobra.Command,
allArgs []string,
configFilePath string,
cfg *config.WebhookConfiguration,
fn func() error,
newConfigHook func() error,
) error {
if err := fn(); err != nil {
if err := newConfigHook(); err != nil {
return err
}
@ -150,7 +158,7 @@ func loadConfigFromFile(
return fmt.Errorf("failed to re-parse flags: %w", err)
}
if err := fn(); err != nil {
if err := newConfigHook(); err != nil {
return err
}
}