Fix pointer assignments, k8s.io/utils/pointer is deprecated

onmetal · Feb 9, 2024 · 474a556 · 474a556
1 parent 648d35a
commit 474a556
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/internal/jitsi/jicofo/deployment.go b/internal/jitsi/jicofo/deployment.go
@@ -28,17 +28,17 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const appName = "jicofo"
 
 const (
-	telegrafExporter      = "telegraf"
-	exporterContainerName = "exporter"
-	defaultExporterUser   = 10001
-	healthPort            = 8888
+	telegrafExporter            = "telegraf"
+	exporterContainerName       = "exporter"
+	defaultExporterUser   int64 = 10001
+	healthPort                  = 8888
 )
 
 const (
@@ -197,11 +197,11 @@ func (j *Jicofo) prepareExporterContainer() corev1.Container {
 			Resources:       j.Spec.Exporter.Resources,
 			ImagePullPolicy: j.Spec.ImagePullPolicy,
 			SecurityContext: &corev1.SecurityContext{
-				RunAsUser:                pointer.Int64(defaultExporterUser),
-				Privileged:               pointer.Bool(false),
-				RunAsNonRoot:             pointer.Bool(true),
-				ReadOnlyRootFilesystem:   pointer.Bool(true),
-				AllowPrivilegeEscalation: pointer.Bool(false),
+				RunAsUser:                ptr.To(defaultExporterUser),
+				Privileged:               ptr.To(false),
+				RunAsNonRoot:             ptr.To(true),
+				ReadOnlyRootFilesystem:   ptr.To(true),
+				AllowPrivilegeEscalation: ptr.To(false),
 			},
 		}
 	}

diff --git a/internal/jitsi/jvb/deployment.go b/internal/jitsi/jvb/deployment.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -54,9 +54,9 @@ const (
 )
 
 const (
-	telegrafExporter      = "telegraf"
-	exporterContainerName = "exporter"
-	defaultExporterUser   = 10001
+	telegrafExporter            = "telegraf"
+	exporterContainerName       = "exporter"
+	defaultExporterUser   int64 = 10001
 )
 
 func (j *JVB) Create() error {
@@ -453,11 +453,11 @@ func (j *JVB) prepareExporterContainer() v1.Container {
 			Resources:       j.Spec.Exporter.Resources,
 			ImagePullPolicy: j.Spec.ImagePullPolicy,
 			SecurityContext: &v1.SecurityContext{
-				RunAsUser:                pointer.Int64(defaultExporterUser),
-				Privileged:               pointer.Bool(false),
-				RunAsNonRoot:             pointer.Bool(true),
-				ReadOnlyRootFilesystem:   pointer.Bool(true),
-				AllowPrivilegeEscalation: pointer.Bool(false),
+				RunAsUser:                ptr.To(defaultExporterUser),
+				Privileged:               ptr.To(false),
+				RunAsNonRoot:             ptr.To(true),
+				ReadOnlyRootFilesystem:   ptr.To(true),
+				AllowPrivilegeEscalation: ptr.To(false),
 			},
 		}
 	}