From 474a5568dc4040ff122404ce1ac52b3a9274f3e3 Mon Sep 17 00:00:00 2001 From: Damyan Yordanov Date: Fri, 9 Feb 2024 15:17:00 +0100 Subject: [PATCH] Fix pointer assignments, `k8s.io/utils/pointer` is deprecated --- internal/jitsi/jicofo/deployment.go | 20 ++++++++++---------- internal/jitsi/jvb/deployment.go | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/jitsi/jicofo/deployment.go b/internal/jitsi/jicofo/deployment.go index 993c491..9a02a07 100644 --- 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 index 3a4f0ea..6eaa4bf 100644 --- 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), }, } }