treewide: add more ptr.To usages
Change-Id: Ibf511bc012a17e39d6b7b4f3a7d9abc1304d755f
Reviewed-on: https://review.monogon.dev/c/monogon/+/3677
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/node/kubernetes/reconciler/resources_csi.go b/metropolis/node/kubernetes/reconciler/resources_csi.go
index a1ca29f..2754528 100644
--- a/metropolis/node/kubernetes/reconciler/resources_csi.go
+++ b/metropolis/node/kubernetes/reconciler/resources_csi.go
@@ -63,7 +63,6 @@
}
func (r resourceCSIDrivers) Expected() []meta.Object {
- fsGroupPolicy := storage.FileFSGroupPolicy
return []meta.Object{
&storage.CSIDriver{
ObjectMeta: meta.ObjectMeta{
@@ -75,7 +74,7 @@
PodInfoOnMount: ptr.To(false),
VolumeLifecycleModes: []storage.VolumeLifecycleMode{storage.VolumeLifecyclePersistent},
StorageCapacity: ptr.To(false),
- FSGroupPolicy: &fsGroupPolicy,
+ FSGroupPolicy: ptr.To(storage.FileFSGroupPolicy),
RequiresRepublish: ptr.To(false),
SELinuxMount: ptr.To(false),
},
diff --git a/metropolis/node/kubernetes/reconciler/resources_storageclass.go b/metropolis/node/kubernetes/reconciler/resources_storageclass.go
index b3afc13..6b4ec73 100644
--- a/metropolis/node/kubernetes/reconciler/resources_storageclass.go
+++ b/metropolis/node/kubernetes/reconciler/resources_storageclass.go
@@ -26,9 +26,6 @@
"k8s.io/utils/ptr"
)
-var reclaimPolicyDelete = core.PersistentVolumeReclaimDelete
-var waitForConsumerBinding = storage.VolumeBindingWaitForFirstConsumer
-
type resourceStorageClasses struct {
kubernetes.Interface
}
@@ -74,8 +71,8 @@
},
AllowVolumeExpansion: ptr.To(true),
Provisioner: csiProvisionerName,
- ReclaimPolicy: &reclaimPolicyDelete,
- VolumeBindingMode: &waitForConsumerBinding,
+ ReclaimPolicy: ptr.To(core.PersistentVolumeReclaimDelete),
+ VolumeBindingMode: ptr.To(storage.VolumeBindingWaitForFirstConsumer),
MountOptions: []string{
"exec",
"dev",