replace deprecated k8s.io/utils/pointer

gardener · Feb 16, 2024 · 02e874a · 02e874a
1 parent 14193fe
commit 02e874a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/pkg/controller/operatingsystemconfig/actuator.go b/pkg/controller/operatingsystemconfig/actuator.go
@@ -23,7 +23,7 @@ import (
 	"github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/go-logr/logr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -130,23 +130,23 @@ func (a *actuator) handleReconcileOSC(_ *extensionsv1alpha1.OperatingSystemConfi
 
 	// disable automatic updates
 	extensionUnits = append(extensionUnits,
-		extensionsv1alpha1.Unit{Name: "update-engine.service", Command: extensionsv1alpha1.UnitCommandPtr(extensionsv1alpha1.CommandStop)},
-		extensionsv1alpha1.Unit{Name: "locksmithd.service", Command: extensionsv1alpha1.UnitCommandPtr(extensionsv1alpha1.CommandStop)},
+		extensionsv1alpha1.Unit{Name: "update-engine.service", Command: ptr.To(extensionsv1alpha1.CommandStop)},
+		extensionsv1alpha1.Unit{Name: "locksmithd.service", Command: ptr.To(extensionsv1alpha1.CommandStop)},
 	)
 
 	// blacklist sctp kernel module
 	extensionFiles = append(extensionFiles, extensionsv1alpha1.File{
 		Path:        filepath.Join("/", "etc", "modprobe.d", "sctp.conf"),
 		Content:     extensionsv1alpha1.FileContent{Inline: &extensionsv1alpha1.FileContentInline{Data: "install sctp /bin/true"}},
-		Permissions: pointer.Int32(0644),
+		Permissions: ptr.To[int32](0644),
 	})
 
 	// add scripts and dropins for kubelet cgroup driver configuration
 	filePathKubeletCGroupDriverScript := filepath.Join("/", "opt", "bin", "kubelet_cgroup_driver.sh")
 	extensionFiles = append(extensionFiles, extensionsv1alpha1.File{
 		Path:        filePathKubeletCGroupDriverScript,
 		Content:     extensionsv1alpha1.FileContent{Inline: &extensionsv1alpha1.FileContentInline{Data: cgroupsv2TemplateContent}},
-		Permissions: pointer.Int32(0755),
+		Permissions: ptr.To[int32](0755),
 	})
 	extensionUnits = append(extensionUnits, extensionsv1alpha1.Unit{
 		Name: "kubelet.service",

diff --git a/pkg/controller/operatingsystemconfig/actuator_test.go b/pkg/controller/operatingsystemconfig/actuator_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-logr/logr"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -50,7 +50,7 @@ var _ = Describe("Actuator", func() {
 		osc = &extensionsv1alpha1.OperatingSystemConfig{
 			Spec: extensionsv1alpha1.OperatingSystemConfigSpec{
 				Purpose: extensionsv1alpha1.OperatingSystemConfigPurposeProvision,
-				Units:   []extensionsv1alpha1.Unit{{Name: "some-unit", Content: pointer.String("foo")}},
+				Units:   []extensionsv1alpha1.Unit{{Name: "some-unit", Content: ptr.To("foo")}},
 				Files:   []extensionsv1alpha1.File{{Path: "/some/file", Content: extensionsv1alpha1.FileContent{Inline: &extensionsv1alpha1.FileContentInline{Data: "bar"}}}},
 			},
 		}
@@ -152,8 +152,8 @@ systemctl enable 'some-unit' && systemctl restart --no-block 'some-unit'
 				Expect(unitNames).To(ConsistOf("some-unit", "enable-cgroupsv2.service"))
 				Expect(fileNames).To(ConsistOf("/some/file"))
 				Expect(extensionUnits).To(ConsistOf(
-					extensionsv1alpha1.Unit{Name: "update-engine.service", Command: extensionsv1alpha1.UnitCommandPtr(extensionsv1alpha1.CommandStop)},
-					extensionsv1alpha1.Unit{Name: "locksmithd.service", Command: extensionsv1alpha1.UnitCommandPtr(extensionsv1alpha1.CommandStop)},
+					extensionsv1alpha1.Unit{Name: "update-engine.service", Command: ptr.To(extensionsv1alpha1.CommandStop)},
+					extensionsv1alpha1.Unit{Name: "locksmithd.service", Command: ptr.To(extensionsv1alpha1.CommandStop)},
 					extensionsv1alpha1.Unit{
 						Name: "kubelet.service",
 						DropIns: []extensionsv1alpha1.DropIn{{
@@ -168,12 +168,12 @@ ExecStartPre=/opt/bin/kubelet_cgroup_driver.sh
 				Expect(extensionFiles).To(ConsistOf(
 					extensionsv1alpha1.File{
 						Path:        "/etc/modprobe.d/sctp.conf",
-						Permissions: pointer.Int32(0644),
+						Permissions: ptr.To[int32](0644),
 						Content:     extensionsv1alpha1.FileContent{Inline: &extensionsv1alpha1.FileContentInline{Data: "install sctp /bin/true"}},
 					},
 					extensionsv1alpha1.File{
 						Path:        "/opt/bin/kubelet_cgroup_driver.sh",
-						Permissions: pointer.Int32(0755),
+						Permissions: ptr.To[int32](0755),
 						Content: extensionsv1alpha1.FileContent{Inline: &extensionsv1alpha1.FileContentInline{Data: `#!/bin/bash
 
 KUBELET_CONFIG=/var/lib/kubelet/config/kubelet

diff --git a/pkg/controller/operatingsystemconfig/coreos_reconcile_test.go b/pkg/controller/operatingsystemconfig/coreos_reconcile_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	. "github.com/gardener/gardener-extension-os-coreos/pkg/controller/operatingsystemconfig"
 	"github.com/gardener/gardener-extension-os-coreos/pkg/controller/operatingsystemconfig/coreos"
@@ -59,7 +59,7 @@ var _ = Describe("CloudConfig", func() {
 				Purpose: extensionsv1alpha1.OperatingSystemConfigPurposeProvision,
 				Files: []extensionsv1alpha1.File{{
 					Path:        "fooPath",
-					Permissions: pointer.Int32(0666),
+					Permissions: ptr.To[int32](0666),
 					Content: extensionsv1alpha1.FileContent{
 						Inline: &extensionsv1alpha1.FileContentInline{
 							Encoding: "b64",
@@ -89,7 +89,7 @@ var _ = Describe("CloudConfig", func() {
 			osc.Spec.Files = append(osc.Spec.Files, extensionsv1alpha1.File{
 				Path: "fooPath",
 				Content: extensionsv1alpha1.FileContent{
-					TransmitUnencoded: pointer.Bool(true),
+					TransmitUnencoded: ptr.To(true),
 					Inline: &extensionsv1alpha1.FileContentInline{
 						Encoding: "b64",
 						Data:     base64.StdEncoding.EncodeToString([]byte("bar")),