use logsapi.LoggingConfiguration instead of logs.Options

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
cert-manager · Aug 17, 2023 · dfdbeb8 · dfdbeb8
1 parent 955db5a
commit dfdbeb8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/internal/apis/config/controller/types.go b/internal/apis/config/controller/types.go
@@ -19,9 +19,8 @@ package controller
 import (
 	"time"
 
-	"k8s.io/component-base/logs"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	logsapi "k8s.io/component-base/logs/api/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -110,7 +109,7 @@ type ControllerConfiguration struct {
 	PprofAddress string
 
 	// https://pkg.go.dev/k8s.io/component-base@v0.27.3/logs/api/v1#LoggingConfiguration
-	Logging logs.Options
+	Logging logsapi.LoggingConfiguration
 
 	// featureGates is a map of feature names to bools that enable or disable experimental
 	// features.

diff --git a/internal/apis/config/webhook/types.go b/internal/apis/config/webhook/types.go
@@ -18,7 +18,7 @@ package webhook
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/component-base/logs"
+	logsapi "k8s.io/component-base/logs/api/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -55,7 +55,7 @@ type WebhookConfiguration struct {
 	PprofAddress string
 
 	// https://pkg.go.dev/k8s.io/component-base@v0.27.3/logs/api/v1#LoggingConfiguration
-	Logging logs.Options
+	Logging logsapi.LoggingConfiguration
 
 	// featureGates is a map of feature names to bools that enable or disable experimental
 	// features.

diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go
@@ -68,7 +68,7 @@ func InitLogs() {
 	log.SetFlags(0)
 }
 
-func AddFlagsNonDeprecated(opts *logs.Options, fs *pflag.FlagSet) {
+func AddFlagsNonDeprecated(opts *logsapi.LoggingConfiguration, fs *pflag.FlagSet) {
 	var allFlags pflag.FlagSet
 	logsapi.AddFlags(opts, &allFlags)
 
@@ -80,7 +80,7 @@ func AddFlagsNonDeprecated(opts *logs.Options, fs *pflag.FlagSet) {
 	})
 }
 
-func AddFlags(opts *logs.Options, fs *pflag.FlagSet) {
+func AddFlags(opts *logsapi.LoggingConfiguration, fs *pflag.FlagSet) {
 	var allFlags flag.FlagSet
 	klog.InitFlags(&allFlags)
 
@@ -95,7 +95,7 @@ func AddFlags(opts *logs.Options, fs *pflag.FlagSet) {
 	AddFlagsNonDeprecated(opts, fs)
 }
 
-func ValidateAndApply(opts *logs.Options) error {
+func ValidateAndApply(opts *logsapi.LoggingConfiguration) error {
 	return logsapi.ValidateAndApply(opts, nil)
 }