Skip to content

Commit 62d0bf6

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #18551 from hakman/modernize-ptrto-new-1.36
Cherry pick of #18549: Replace fi.PtrTo with new() builtin
2 parents 2b33288 + f47ed30 commit 62d0bf6

255 files changed

Lines changed: 2399 additions & 2474 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎channels/pkg/channels/addons_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
fakekubernetes "k8s.io/client-go/kubernetes/fake"
3131
"k8s.io/kops/channels/pkg/api"
32-
"k8s.io/kops/upup/pkg/fi"
3332
"k8s.io/kops/upup/pkg/fi/utils"
3433
)
3534

@@ -349,7 +348,7 @@ func Test_GetRequiredUpdates(t *testing.T) {
349348
addon := &Addon{
350349
Name: "test",
351350
Spec: &api.AddonSpec{
352-
Name: fi.PtrTo("test"),
351+
Name: new("test"),
353352
NeedsPKI: true,
354353
},
355354
}
@@ -377,7 +376,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
377376
newAddon: &Addon{
378377
Name: "test",
379378
Spec: &api.AddonSpec{
380-
Name: fi.PtrTo("test"),
379+
Name: new("test"),
381380
ManifestHash: "originalHash",
382381
NeedsRollingUpdate: api.NeedsRollingUpdateAll,
383382
},
@@ -387,7 +386,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
387386
newAddon: &Addon{
388387
Name: "test",
389388
Spec: &api.AddonSpec{
390-
Name: fi.PtrTo("test"),
389+
Name: new("test"),
391390
ManifestHash: "newHash",
392391
NeedsRollingUpdate: api.NeedsRollingUpdateAll,
393392
},
@@ -399,7 +398,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
399398
newAddon: &Addon{
400399
Name: "test",
401400
Spec: &api.AddonSpec{
402-
Name: fi.PtrTo("test"),
401+
Name: new("test"),
403402
ManifestHash: "newHash",
404403
NeedsRollingUpdate: api.NeedsRollingUpdateWorkers,
405404
},
@@ -411,7 +410,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
411410
newAddon: &Addon{
412411
Name: "test",
413412
Spec: &api.AddonSpec{
414-
Name: fi.PtrTo("test"),
413+
Name: new("test"),
415414
ManifestHash: "newHash",
416415
NeedsRollingUpdate: api.NeedsRollingUpdateControlPlane,
417416
},
@@ -423,7 +422,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
423422
newAddon: &Addon{
424423
Name: "test",
425424
Spec: &api.AddonSpec{
426-
Name: fi.PtrTo("test"),
425+
Name: new("test"),
427426
ManifestHash: "newHash",
428427
NeedsRollingUpdate: api.NeedsRollingUpdateAll,
429428
},
@@ -542,7 +541,7 @@ func Test_InstallPKI(t *testing.T) {
542541
addon := &Addon{
543542
Name: "test",
544543
Spec: &api.AddonSpec{
545-
Name: fi.PtrTo("test"),
544+
Name: new("test"),
546545
NeedsPKI: true,
547546
},
548547
}

‎channels/pkg/cmd/apply_channel_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
fakek8s "k8s.io/client-go/kubernetes/fake"
2727
"k8s.io/kops/channels/pkg/api"
2828
"k8s.io/kops/channels/pkg/channels"
29-
"k8s.io/kops/upup/pkg/fi"
3029
)
3130

3231
func TestGetUpdates(t *testing.T) {
@@ -59,7 +58,7 @@ func TestGetUpdates(t *testing.T) {
5958
"aws-ebs-csi-driver.addons.k8s.io": {
6059
Name: "aws-ebs-csi-driver.addons.k8s.io",
6160
Spec: &api.AddonSpec{
62-
Name: fi.PtrTo("aws-ebs-csi-driver.addons.k8s.io"),
61+
Name: new("aws-ebs-csi-driver.addons.k8s.io"),
6362
Id: "k8s-1.17",
6463
ManifestHash: "abc",
6564
},

‎cloudmock/openstack/mockcompute/servers.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"strings"
2626

2727
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
28-
"k8s.io/kops/upup/pkg/fi"
2928

3029
"github.com/google/uuid"
3130
"github.com/gophercloud/gophercloud/v2"
@@ -236,7 +235,7 @@ func (m *MockClient) createServer(w http.ResponseWriter, r *http.Request) {
236235

237236
portID := create.Server.Networks[0].Port
238237
ports.Update(r.Context(), m.networkClient, portID, ports.UpdateOpts{
239-
DeviceID: fi.PtrTo(server.ID),
238+
DeviceID: new(server.ID),
240239
})
241240

242241
// Assign an IP address

‎clusterapi/pkg/builders/utils.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ func makeRef(u *unstructured.Unstructured) map[string]any {
3939
// Kind: kind,
4040
// Name: owner.GetName(),
4141
// UID: owner.GetUID(),
42-
// Controller: PtrTo(true),
42+
// Controller: new(true),
4343
// },
4444
// })
4545
// }
46-
47-
func PtrTo[T any](t T) *T {
48-
return &t
49-
}

‎cmd/kops-controller/controllers/awsipam.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"k8s.io/apimachinery/pkg/types"
3636
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
3737
"k8s.io/klog/v2"
38-
"k8s.io/kops/upup/pkg/fi"
3938
"k8s.io/kops/util/pkg/awslog"
4039
ctrl "sigs.k8s.io/controller-runtime"
4140
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -123,7 +122,7 @@ func (r *AWSIPAMReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
123122
eni, err := r.ec2Client.DescribeNetworkInterfaces(ctx, &ec2.DescribeNetworkInterfacesInput{
124123
Filters: []ec2types.Filter{
125124
{
126-
Name: fi.PtrTo("attachment.instance-id"),
125+
Name: new("attachment.instance-id"),
127126
Values: []string{
128127
instanceID,
129128
},

‎cmd/kops/create_cluster.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
617617
if group.Spec.RootVolume == nil {
618618
group.Spec.RootVolume = &api.InstanceRootVolumeSpec{}
619619
}
620-
group.Spec.RootVolume.Size = fi.PtrTo(c.ControlPlaneVolumeSize)
620+
group.Spec.RootVolume.Size = new(c.ControlPlaneVolumeSize)
621621
}
622622
}
623623

@@ -626,7 +626,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
626626
if group.Spec.RootVolume == nil {
627627
group.Spec.RootVolume = &api.InstanceRootVolumeSpec{}
628628
}
629-
group.Spec.RootVolume.Type = fi.PtrTo(c.ControlPlaneVolumeType)
629+
group.Spec.RootVolume.Type = new(c.ControlPlaneVolumeType)
630630
}
631631
}
632632

@@ -635,7 +635,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
635635
if group.Spec.RootVolume == nil {
636636
group.Spec.RootVolume = &api.InstanceRootVolumeSpec{}
637637
}
638-
group.Spec.RootVolume.Size = fi.PtrTo(c.NodeVolumeSize)
638+
group.Spec.RootVolume.Size = new(c.NodeVolumeSize)
639639
}
640640
}
641641

@@ -644,7 +644,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
644644
if group.Spec.RootVolume == nil {
645645
group.Spec.RootVolume = &api.InstanceRootVolumeSpec{}
646646
}
647-
group.Spec.RootVolume.Type = fi.PtrTo(c.NodeVolumeType)
647+
group.Spec.RootVolume.Type = new(c.NodeVolumeType)
648648
}
649649
}
650650

@@ -661,7 +661,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
661661
}
662662

663663
if c.DisableSubnetTags {
664-
cluster.Spec.Networking.TagSubnets = fi.PtrTo(false)
664+
cluster.Spec.Networking.TagSubnets = new(false)
665665
}
666666

667667
if c.APIPublicName != "" {
@@ -684,7 +684,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
684684
cluster.Spec.KubeProxy = &api.KubeProxyConfig{}
685685
}
686686
if cluster.Spec.KubeProxy.Enabled == nil {
687-
cluster.Spec.KubeProxy.Enabled = fi.PtrTo(false)
687+
cluster.Spec.KubeProxy.Enabled = new(false)
688688
}
689689
}
690690

‎cmd/kops/get_keypairs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func listKeypairs(keyStore fi.CAStore, names []string, includeDistrusted bool) (
153153
keypair.AlternateNames = alternateNames
154154
}
155155
if rsaKey, ok := cert.PublicKey.(*rsa.PublicKey); ok {
156-
keypair.KeyLength = fi.PtrTo(rsaKey.N.BitLen())
156+
keypair.KeyLength = new(rsaKey.N.BitLen())
157157
}
158158
}
159159
items = append(items, &keypair)

‎examples/kops-api-example/up.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
api "k8s.io/kops/pkg/apis/kops"
2626
"k8s.io/kops/pkg/client/simple/vfsclientset"
27-
"k8s.io/kops/upup/pkg/fi"
2827
"k8s.io/kops/upup/pkg/fi/cloudup"
2928
"k8s.io/kops/upup/pkg/fi/utils"
3029
"k8s.io/kops/util/pkg/vfs"
@@ -60,7 +59,7 @@ func up(vfsContext *vfs.VFSContext, ctx context.Context) error {
6059
for _, masterZone := range masterZones {
6160
etcdMember := api.EtcdMemberSpec{
6261
Name: masterZone,
63-
InstanceGroup: fi.PtrTo(masterZone),
62+
InstanceGroup: new(masterZone),
6463
}
6564
etcdCluster.Members = append(etcdCluster.Members, etcdMember)
6665
}

‎nodeup/pkg/bootstrap/install.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (i *Installation) buildSystemdJob() *nodetasks.InstallService {
172172

173173
service := &nodetasks.InstallService{Service: nodetasks.Service{
174174
Name: serviceName,
175-
Definition: fi.PtrTo(manifestString),
175+
Definition: new(manifestString),
176176
}}
177177

178178
service.InitDefaults()

‎nodeup/pkg/model/channels.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ func (b *ChannelsBuilder) Build(c *fi.NodeupModelBuilderContext) error {
6666
Path: channelsKubeconfigPath,
6767
Contents: kubeconfig,
6868
Type: nodetasks.FileType_File,
69-
Mode: fi.PtrTo("0400"),
70-
Owner: fi.PtrTo(wellknownusers.KopsChannelsName),
69+
Mode: new("0400"),
70+
Owner: new(wellknownusers.KopsChannelsName),
7171
})
7272

7373
manifest, err := b.readChannelsManifest(c)

0 commit comments

Comments
 (0)