Merge pull request #19 from dtantsur/pointer

Avoid deprecated k8s.io/utils/pointer
metal3-io · Mar 26, 2024 · 0d255c4 · 0d255c4
2 parents 3f86ad0 + 9a86ab0
commit 0d255c4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/pkg/ironic/containers.go b/pkg/ironic/containers.go
@@ -9,7 +9,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
 )
@@ -19,8 +19,8 @@ const (
 	imagesPortName    = "image-svc"
 	imagesTLSPortName = "image-svc-tls"
 
-	ironicUser  = 997
-	ironicGroup = 994
+	ironicUser  int64 = 997
+	ironicGroup int64 = 994
 
 	authDir   = "/auth"
 	certsDir  = "/certs"
@@ -384,9 +384,9 @@ func newDnsmasqContainer(ironic *metal3api.Ironic) corev1.Container {
 		Command: []string{"/bin/rundnsmasq"},
 		Env:     envVars,
 		SecurityContext: &corev1.SecurityContext{
-			RunAsUser:                pointer.Int64(ironicUser),
-			RunAsGroup:               pointer.Int64(ironicGroup),
-			AllowPrivilegeEscalation: pointer.Bool(true),
+			RunAsUser:                ptr.To(ironicUser),
+			RunAsGroup:               ptr.To(ironicGroup),
+			AllowPrivilegeEscalation: ptr.To(true),
 			Capabilities: &corev1.Capabilities{
 				Drop: []corev1.Capability{"ALL"},
 				Add:  []corev1.Capability{"NET_ADMIN", "NET_BIND_SERVICE", "NET_RAW"},
@@ -422,8 +422,8 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 			Env:          ipaDownloaderVars,
 			VolumeMounts: []corev1.VolumeMount{sharedVolumeMount},
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:  pointer.Int64(ironicUser),
-				RunAsGroup: pointer.Int64(ironicGroup),
+				RunAsUser:  ptr.To(ironicUser),
+				RunAsGroup: ptr.To(ironicGroup),
 				Capabilities: &corev1.Capabilities{
 					Drop: []corev1.Capability{"ALL"},
 				},
@@ -444,8 +444,8 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 			Env:          buildIronicEnvVars(ironic, db, htpasswd, domain),
 			VolumeMounts: mounts,
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:  pointer.Int64(ironicUser),
-				RunAsGroup: pointer.Int64(ironicGroup),
+				RunAsUser:  ptr.To(ironicUser),
+				RunAsGroup: ptr.To(ironicGroup),
 				Capabilities: &corev1.Capabilities{
 					Drop: []corev1.Capability{"ALL"},
 				},
@@ -461,8 +461,8 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 			Env:          buildHttpdEnvVars(ironic, htpasswd),
 			VolumeMounts: mounts,
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:  pointer.Int64(ironicUser),
-				RunAsGroup: pointer.Int64(ironicGroup),
+				RunAsUser:  ptr.To(ironicUser),
+				RunAsGroup: ptr.To(ironicGroup),
 				Capabilities: &corev1.Capabilities{
 					Drop: []corev1.Capability{"ALL"},
 				},
@@ -477,8 +477,8 @@ func newIronicPodTemplate(ironic *metal3api.Ironic, db *metal3api.IronicDatabase
 			Command:      []string{"/bin/runlogwatch.sh"},
 			VolumeMounts: []corev1.VolumeMount{sharedVolumeMount},
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:  pointer.Int64(ironicUser),
-				RunAsGroup: pointer.Int64(ironicGroup),
+				RunAsUser:  ptr.To(ironicUser),
+				RunAsGroup: ptr.To(ironicGroup),
 				Capabilities: &corev1.Capabilities{
 					Drop: []corev1.Capability{"ALL"},
 				},

diff --git a/pkg/ironic/database.go b/pkg/ironic/database.go
@@ -6,15 +6,15 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
 )
 
 const (
-	databasePort = 3306
-	databaseUser = 27
+	databasePort       = 3306
+	databaseUser int64 = 27
 )
 
 func databaseDeploymentName(db *metal3api.IronicDatabase) string {
@@ -100,8 +100,8 @@ func newDatabasePodTemplate(db *metal3api.IronicDatabase) corev1.PodTemplateSpec
 			Env:          envVars,
 			VolumeMounts: mounts,
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:  pointer.Int64(databaseUser),
-				RunAsGroup: pointer.Int64(databaseUser),
+				RunAsUser:  ptr.To(databaseUser),
+				RunAsGroup: ptr.To(databaseUser),
 			},
 			LivenessProbe:  probe,
 			ReadinessProbe: probe,
@@ -130,7 +130,7 @@ func ensureDatabaseDeployment(cctx ControllerContext, db *metal3api.IronicDataba
 			deploy.Spec.Selector = &metav1.LabelSelector{
 				MatchLabels: matchLabels,
 			}
-			deploy.Spec.Replicas = pointer.Int32(1)
+			deploy.Spec.Replicas = ptr.To(int32(1))
 		}
 		deploy.Spec.Template = newDatabasePodTemplate(db)
 		return controllerutil.SetControllerReference(db, deploy, cctx.Scheme)

diff --git a/pkg/ironic/ironic.go b/pkg/ironic/ironic.go
@@ -9,7 +9,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -71,7 +71,7 @@ func ensureIronicDeployment(cctx ControllerContext, ironic *metal3api.Ironic, db
 			deploy.Spec.Selector = &metav1.LabelSelector{
 				MatchLabels: matchLabels,
 			}
-			deploy.Spec.Replicas = pointer.Int32(1)
+			deploy.Spec.Replicas = ptr.To(int32(1))
 		}
 		deploy.Spec.Template = template
 		// We cannot run two copies of Ironic in parallel