Fix linter errors

intel · Jul 11, 2024 · a5d4987 · a5d4987
1 parent 4fb980b
commit a5d4987
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/cmd/gardener-extension-cri-resmgr/app/app.go b/cmd/gardener-extension-cri-resmgr/app/app.go
@@ -44,7 +44,7 @@ func NewExtensionControllerCommand(ctx context.Context) *cobra.Command {
 		Use:   "cri-resmgr-controller-manager",
 		Short: "CRI Resource manager Controller manages components which install CRI-Resource-Manager as CRI proxy.",
 
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			if err := options.OptionAggregator.Complete(); err != nil {
 				return fmt.Errorf("error completing options: %s", err)
 			}

diff --git a/pkg/controller/lifecycle/add_test.go b/pkg/controller/lifecycle/add_test.go
@@ -13,7 +13,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
+	"k8s.io/klog/v2/textlogger"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
@@ -39,7 +39,8 @@ var _ = Describe("ConfigMapToAllExtensionMapper tests", func() {
 		buffer = bytes.NewBuffer(nil)
 		klog.SetOutput(buffer)
 		klog.LogToStderr(false)
-		log = klogr.New()
+		//log = klogr.New()
+		log = textlogger.NewLogger(nil)
 
 		mockCtrl = gomock.NewController(GinkgoT())
 		reader = mocks.NewMockReader(mockCtrl)

diff --git a/test/e2e/cri-resmgr-extension/common_test.go b/test/e2e/cri-resmgr-extension/common_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/gardener/gardener/test/framework"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var (
@@ -45,14 +45,14 @@ func enableOrDisableCriResmgr(shoot *gardencorev1beta1.Shoot, disabled bool) err
 	for i, extension := range shoot.Spec.Extensions {
 		if extension.Type == ExtensionType {
 			if extension.Disabled != nil {
-				shoot.Spec.Extensions[i].Disabled = pointer.Bool(disabled)
+				shoot.Spec.Extensions[i].Disabled = ptr.To(disabled)
 			}
 		}
 	}
 	if len(shoot.Spec.Extensions) == 0 {
 		shoot.Spec.Extensions = append(shoot.Spec.Extensions, gardencorev1beta1.Extension{
 			Type:     ExtensionType,
-			Disabled: pointer.Bool(disabled),
+			Disabled: ptr.To(disabled),
 		})
 	}
 	return nil
@@ -87,7 +87,7 @@ func getShoot() *gardencorev1beta1.Shoot {
 			Region:            "local",
 			SecretBindingName: &secretBindingName,
 			CloudProfileName:  "local",
-			SeedName:          pointer.String("local"),
+			SeedName:          ptr.To("local"),
 			Kubernetes: gardencorev1beta1.Kubernetes{
 				Version: kubernetesVersion,
 			},