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/test/launch/BUILD.bazel b/metropolis/test/launch/BUILD.bazel
index 50f0ede..fca8bbf 100644
--- a/metropolis/test/launch/BUILD.bazel
+++ b/metropolis/test/launch/BUILD.bazel
@@ -56,6 +56,7 @@
"@io_bazel_rules_go//go/runfiles:go_default_library",
"@io_k8s_client_go//kubernetes",
"@io_k8s_client_go//rest",
+ "@io_k8s_utils//ptr",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
diff --git a/metropolis/test/launch/cluster.go b/metropolis/test/launch/cluster.go
index 107cd55..b46cc68 100644
--- a/metropolis/test/launch/cluster.go
+++ b/metropolis/test/launch/cluster.go
@@ -36,6 +36,7 @@
"google.golang.org/protobuf/proto"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
+ "k8s.io/utils/ptr"
ipb "source.monogon.dev/metropolis/node/core/curator/proto/api"
apb "source.monogon.dev/metropolis/proto/api"
@@ -1415,13 +1416,12 @@
}
mgmt := apb.NewManagementClient(curC)
- tr := true
launch.Log("Cluster: %s: adding KubernetesWorker", id)
_, err = mgmt.UpdateNodeRoles(ctx, &apb.UpdateNodeRolesRequest{
Node: &apb.UpdateNodeRolesRequest_Id{
Id: id,
},
- KubernetesWorker: &tr,
+ KubernetesWorker: ptr.To(true),
})
return err
}
@@ -1434,13 +1434,12 @@
}
mgmt := apb.NewManagementClient(curC)
- tr := true
launch.Log("Cluster: %s: adding KubernetesController", id)
_, err = mgmt.UpdateNodeRoles(ctx, &apb.UpdateNodeRolesRequest{
Node: &apb.UpdateNodeRolesRequest_Id{
Id: id,
},
- KubernetesController: &tr,
+ KubernetesController: ptr.To(true),
})
return err
}
@@ -1454,7 +1453,6 @@
mgmt := apb.NewManagementClient(curC)
cur := ipb.NewCuratorClient(curC)
- tr := true
launch.Log("Cluster: %s: adding ConsensusMember", id)
bo := backoff.NewExponentialBackOff()
bo.MaxElapsedTime = 10 * time.Second
@@ -1464,7 +1462,7 @@
Node: &apb.UpdateNodeRolesRequest_Id{
Id: id,
},
- ConsensusMember: &tr,
+ ConsensusMember: ptr.To(true),
})
if err != nil {
launch.Log("Cluster: %s: UpdateNodeRoles failed: %v", id, err)