Skip to content

Commit 46b8ccb

Browse files
Danil-GrigorevDanil-Grigorev
committed
Lint fixes
Signed-off-by: Danil Grigorev <[email protected]>
1 parent fa7dfa5 commit 46b8ccb

25 files changed

+102
-84
lines changed

‎api/v1alpha1/provider_conversion.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121

2222
apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
23-
"k8s.io/utils/pointer"
23+
"k8s.io/utils/ptr"
2424
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2525
ctrlconfigv1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
2626
"sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -525,5 +525,5 @@ func fromImageMeta(im *ImageMeta) *string {
525525
result = result + ":" + im.Tag
526526
}
527527

528-
return pointer.String(result)
528+
return ptr.To(result)
529529
}

‎cmd/main.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3131
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3232
"k8s.io/klog/v2"
33-
"k8s.io/klog/v2/klogr"
33+
"k8s.io/klog/v2/textlogger"
3434
"sigs.k8s.io/cluster-api-operator/internal/webhook"
3535
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3636
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
@@ -131,7 +131,9 @@ func main() {
131131
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
132132
pflag.Parse()
133133

134-
ctrl.SetLogger(klogr.New())
134+
loggerConfig := textlogger.NewConfig([]textlogger.ConfigOption{}...)
135+
ctrl.SetLogger(textlogger.NewLogger(loggerConfig))
136+
135137
restConfig := ctrl.GetConfigOrDie()
136138

137139
diagnosticsOpts := flags.GetDiagnosticsOptions(diagnosticsOptions)

‎cmd/plugin/cmd/delete.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/fields"
3030
"k8s.io/apimachinery/pkg/util/wait"
31-
"k8s.io/klog/v2/klogr"
31+
"k8s.io/klog/v2/textlogger"
3232

3333
kerrors "k8s.io/apimachinery/pkg/util/errors"
3434

@@ -142,7 +142,8 @@ func init() {
142142
func runDelete() error {
143143
ctx := context.Background()
144144

145-
ctrl.SetLogger(klogr.New())
145+
loggerConfig := textlogger.NewConfig([]textlogger.ConfigOption{}...)
146+
ctrl.SetLogger(textlogger.NewLogger(loggerConfig))
146147

147148
hasProviderNames := deleteOpts.coreProvider ||
148149
(len(deleteOpts.bootstrapProviders) > 0) ||

‎cmd/plugin/cmd/init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ func TestInitProviders(t *testing.T) {
329329

330330
for _, genericProvider := range tt.wantedProviders {
331331
g.Eventually(func(g Gomega) {
332-
copy := genericProvider.DeepCopyObject().(generic.Provider)
332+
copy := genericProvider.DeepCopyObject().(generic.Provider) //nolint
333333
g.Expect(env.Get(ctx, ctrlclient.ObjectKeyFromObject(genericProvider), copy)).To(Succeed())
334334
g.Expect(copy.GetSpec().Version).To(Equal(genericProvider.GetSpec().Version))
335335
}, waitShort).Should(Succeed())

‎cmd/plugin/cmd/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
3030

31-
// We need to initalize all registered providers
31+
// We need to initialize all registered providers.
3232
_ "sigs.k8s.io/cluster-api-operator/internal/controller/providers"
3333
)
3434

‎cmd/plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"sigs.k8s.io/cluster-api-operator/cmd/plugin/cmd"
2323

24-
// We need to initalize all registered providers
24+
// We need to initialize all registered providers.
2525
_ "sigs.k8s.io/cluster-api-operator/internal/controller/providers"
2626
)
2727

‎go.mod

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ require (
1010
github.com/google/go-cmp v0.6.0
1111
github.com/google/go-github/v52 v52.0.0
1212
github.com/google/gofuzz v1.2.0
13+
github.com/onsi/ginkgo/v2 v2.15.0
1314
github.com/onsi/gomega v1.32.0
1415
github.com/spf13/cobra v1.8.0
1516
github.com/spf13/pflag v1.0.5
@@ -52,6 +53,7 @@ require (
5253
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5354
github.com/go-openapi/jsonreference v0.20.2 // indirect
5455
github.com/go-openapi/swag v0.22.3 // indirect
56+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5557
github.com/gobuffalo/flect v1.0.2 // indirect
5658
github.com/gogo/protobuf v1.3.2 // indirect
5759
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -60,6 +62,7 @@ require (
6062
github.com/google/gnostic-models v0.6.8 // indirect
6163
github.com/google/go-github/v53 v53.2.0 // indirect
6264
github.com/google/go-querystring v1.1.0 // indirect
65+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6366
github.com/google/uuid v1.4.0 // indirect
6467
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
6568
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -111,6 +114,7 @@ require (
111114
golang.org/x/term v0.18.0 // indirect
112115
golang.org/x/text v0.14.0 // indirect
113116
golang.org/x/time v0.3.0 // indirect
117+
golang.org/x/tools v0.16.1 // indirect
114118
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
115119
google.golang.org/appengine v1.6.7 // indirect
116120
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect

‎go.sum

+1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
349349
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
350350
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
351351
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
352+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
352353
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
353354
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
354355
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=

‎internal/controller/generic/interfaces.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type Group[P Provider] interface {
5959
GetClusterctlProvider() *clusterctlv1.Provider
6060
}
6161

62-
// NewGroup is a function that creates a new group
62+
// NewGroup is a function that creates a new group.
6363
type NewGroup[P Provider] func(P, ProviderList, GroupBuilder[P]) Group[P]
6464

6565
type ProviderReconciler[P Provider] interface {

‎internal/controller/phases/component_customizer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2929
"k8s.io/client-go/kubernetes/scheme"
3030
configv1alpha1 "k8s.io/component-base/config/v1alpha1"
31-
"k8s.io/utils/pointer"
31+
"k8s.io/utils/ptr"
3232
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
3333
"sigs.k8s.io/cluster-api/util"
3434
)
@@ -131,7 +131,7 @@ func customizeDeploymentSpec(pSpec operatorv1.ProviderSpec, d *appsv1.Deployment
131131
dSpec := pSpec.Deployment
132132

133133
if dSpec.Replicas != nil {
134-
d.Spec.Replicas = pointer.Int32(int32(*dSpec.Replicas))
134+
d.Spec.Replicas = ptr.To(int32(*dSpec.Replicas))
135135
}
136136

137137
if dSpec.Affinity != nil {

‎internal/controller/phases/component_customizer_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/intstr"
3131
"k8s.io/client-go/kubernetes/scheme"
3232
configv1alpha1 "k8s.io/component-base/config/v1alpha1"
33-
"k8s.io/utils/pointer"
33+
"k8s.io/utils/ptr"
3434

3535
operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
3636
)
@@ -112,11 +112,11 @@ func TestCustomizeDeployment(t *testing.T) {
112112
{
113113
name: "only replicas modified",
114114
inputDeploymentSpec: &operatorv1.DeploymentSpec{
115-
Replicas: pointer.Int(3),
115+
Replicas: ptr.To(3),
116116
},
117117
expectedDeploymentSpec: func(inputDS *appsv1.DeploymentSpec) (*appsv1.DeploymentSpec, bool) {
118118
expectedDS := &appsv1.DeploymentSpec{
119-
Replicas: pointer.Int32(3),
119+
Replicas: ptr.To(int32(3)),
120120
}
121121

122122
return expectedDS, reflect.DeepEqual(inputDS.Replicas, expectedDS.Replicas)
@@ -251,7 +251,7 @@ func TestCustomizeDeployment(t *testing.T) {
251251
Containers: []operatorv1.ContainerSpec{
252252
{
253253
Name: "manager",
254-
ImageURL: pointer.String("quay.io/dev/mydns:v3.4.2"),
254+
ImageURL: ptr.To("quay.io/dev/mydns:v3.4.2"),
255255
Env: []corev1.EnvVar{
256256
{
257257
Name: "test1",
@@ -324,7 +324,7 @@ func TestCustomizeDeployment(t *testing.T) {
324324
{
325325
name: "all deployment options",
326326
inputDeploymentSpec: &operatorv1.DeploymentSpec{
327-
Replicas: pointer.Int(3),
327+
Replicas: ptr.To(3),
328328
NodeSelector: map[string]string{"a": "b"},
329329
Tolerations: []corev1.Toleration{
330330
{
@@ -351,7 +351,7 @@ func TestCustomizeDeployment(t *testing.T) {
351351
Containers: []operatorv1.ContainerSpec{
352352
{
353353
Name: "manager",
354-
ImageURL: pointer.String("quay.io/dev/mydns:v3.4.2"),
354+
ImageURL: ptr.To("quay.io/dev/mydns:v3.4.2"),
355355
Env: []corev1.EnvVar{
356356
{
357357
Name: "test1",
@@ -375,7 +375,7 @@ func TestCustomizeDeployment(t *testing.T) {
375375
},
376376
expectedDeploymentSpec: func(inputDS *appsv1.DeploymentSpec) (*appsv1.DeploymentSpec, bool) {
377377
expectedDS := &appsv1.DeploymentSpec{
378-
Replicas: pointer.Int32(3),
378+
Replicas: ptr.To(int32(3)),
379379
Template: corev1.PodTemplateSpec{
380380
Spec: corev1.PodSpec{
381381
NodeSelector: map[string]string{"a": "b"},
@@ -480,11 +480,11 @@ func TestCustomizeDeployment(t *testing.T) {
480480
LivenessEndpointName: "mostly",
481481
},
482482
Webhook: operatorv1.ControllerWebhook{
483-
Port: pointer.Int(3579),
483+
Port: ptr.To(3579),
484484
CertDir: "/tmp/certs",
485485
},
486486
LeaderElection: &configv1alpha1.LeaderElectionConfiguration{
487-
LeaderElect: pointer.Bool(true),
487+
LeaderElect: ptr.To(true),
488488
ResourceName: "foo",
489489
ResourceNamespace: "here",
490490
LeaseDuration: metav1.Duration{Duration: sevenHours},
@@ -602,7 +602,7 @@ func TestCustomizeMultipleDeployment(t *testing.T) {
602602
Namespace: metav1.NamespaceSystem,
603603
},
604604
Spec: appsv1.DeploymentSpec{
605-
Replicas: pointer.Int32(3),
605+
Replicas: ptr.To(int32(3)),
606606
},
607607
}
608608

@@ -627,7 +627,7 @@ func TestCustomizeMultipleDeployment(t *testing.T) {
627627
Spec: operatorv1.CoreProviderSpec{
628628
ProviderSpec: operatorv1.ProviderSpec{
629629
Deployment: &operatorv1.DeploymentSpec{
630-
Replicas: pointer.Int(10),
630+
Replicas: ptr.To(10),
631631
},
632632
},
633633
},

‎internal/controller/phases/preflight_checks.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ func PreflightChecks[P generic.Provider](ctx context.Context, phase generic.Grou
6363
return ctrl.Result{}, fmt.Errorf("failed to generate a list of predefined providers: %w", err)
6464
}
6565

66-
if !isPredefinedProvider && spec.FetchConfig == nil {
66+
switch {
67+
case !isPredefinedProvider && spec.FetchConfig == nil:
6768
conditions.Set(phase.GetProvider(), conditions.FalseCondition(
6869
operatorv1.PreflightCheckCondition,
6970
operatorv1.FetchConfigValidationErrorReason,
@@ -72,7 +73,7 @@ func PreflightChecks[P generic.Provider](ctx context.Context, phase generic.Grou
7273
))
7374

7475
return ctrl.Result{}, fmt.Errorf("either selector or URL must be provided for a not predefined provider %s", phase.GetProvider().GetName())
75-
} else if spec.FetchConfig != nil && (spec.FetchConfig.Selector == nil && spec.FetchConfig.URL == "") {
76+
case spec.FetchConfig != nil && (spec.FetchConfig.Selector == nil && spec.FetchConfig.URL == ""):
7677
conditions.Set(phase.GetProvider(), conditions.FalseCondition(
7778
operatorv1.PreflightCheckCondition,
7879
operatorv1.FetchConfigValidationErrorReason,
@@ -81,7 +82,7 @@ func PreflightChecks[P generic.Provider](ctx context.Context, phase generic.Grou
8182
))
8283

8384
return ctrl.Result{}, fmt.Errorf("either selector or URL must be provided for provider %s", phase.GetProvider().GetName())
84-
} else if spec.FetchConfig != nil && spec.FetchConfig.Selector != nil && spec.FetchConfig.URL != "" {
85+
case spec.FetchConfig != nil && spec.FetchConfig.Selector != nil && spec.FetchConfig.URL != "":
8586
// If FetchConfiguration is not nil, exactly one of `URL` or `Selector` must be specified.
8687
conditions.Set(phase.GetProvider(), conditions.FalseCondition(
8788
operatorv1.PreflightCheckCondition,

‎internal/controller/preflight_checks_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ func TestInfrastructurePreflightChecks(t *testing.T) {
456456
}
457457

458458
for _, c := range tc.otherProviders {
459-
gs.Expect(fakeclient.Create(ctx, c.DeepCopyObject().(client.Object))).To(Succeed())
459+
gs.Expect(fakeclient.Create(ctx, c.DeepCopyObject().(client.Object))).To(Succeed()) //nolint:forcetypeassert
460460
}
461461

462462
rec := NewProviderControllerWrapper(

‎internal/controller/provider_controller_wrapper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const (
5555

5656
func (r *ProviderControllerWrapper[P, R]) SetupWithManager(mgr ctrl.Manager, options controller.Options) error {
5757
return ctrl.NewControllerManagedBy(mgr).
58-
For(reflect.New(reflect.TypeOf(*new(P)).Elem()).Interface().(P)).
58+
For(reflect.New(reflect.TypeOf(*new(P)).Elem()).Interface().(P)). //nolint:forcetypeassert
5959
WithOptions(options).
6060
Complete(reconcile.AsReconciler(mgr.GetClient(), r))
6161
}

‎internal/controller/provider_controller_wrapper_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ releaseSeries:
288288
}
289289

290290
conditions.MarkTrue(core, clusterv1.ReadyCondition)
291+
291292
return env.Status().Update(ctx, core)
292293
}).Should(Succeed())
293294

‎internal/controller/providers/addon.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,18 @@ func NewAddonProviderReconciler(conn generic.Connector) generic.ProviderReconcil
3636
}
3737
}
3838

39-
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider
39+
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider.
4040
func (r *AddonProviderReconciler) ClusterctlProviderType() clusterctlv1.ProviderType {
4141
return clusterctlv1.AddonProviderType
4242
}
4343

44-
// ClusterctlProvider returns Provider stucture of the underlying clusterctl provider
44+
// ClusterctlProvider returns Provider structure of the underlying clusterctl provider.
4545
func (r *AddonProviderReconciler) ClusterctlProvider(provider *operatorv1.AddonProvider) *clusterctlv1.Provider {
46-
clusterctlProvider := &clusterctlv1.Provider{ObjectMeta: metav1.ObjectMeta{
47-
Name: "addon-" + provider.GetName(),
48-
Namespace: provider.GetNamespace(),
49-
},
46+
clusterctlProvider := &clusterctlv1.Provider{
47+
ObjectMeta: metav1.ObjectMeta{
48+
Name: "addon-" + provider.GetName(),
49+
Namespace: provider.GetNamespace(),
50+
},
5051
Type: string(r.ClusterctlProviderType()),
5152
ProviderName: provider.GetName(),
5253
Version: *util.Or(provider.GetStatus().InstalledVersion, ptr.To("")),
@@ -55,7 +56,7 @@ func (r *AddonProviderReconciler) ClusterctlProvider(provider *operatorv1.AddonP
5556
return clusterctlProvider
5657
}
5758

58-
// ProviderList returns empty typed list for provider
59+
// GetProviderList returns empty typed list for provider.
5960
func (r *AddonProviderReconciler) GetProviderList() generic.ProviderList {
6061
return &operatorv1.AddonProviderList{}
6162
}

‎internal/controller/providers/bootstrap.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,18 @@ func NewBootstrapProviderReconciler(conn generic.Connector) generic.ProviderReco
3636
}
3737
}
3838

39-
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider
39+
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider.
4040
func (r *BootstrapProviderReconciler) ClusterctlProviderType() clusterctlv1.ProviderType {
4141
return clusterctlv1.BootstrapProviderType
4242
}
4343

44-
// ClusterctlProvider returns Provider stucture of the underlying clusterctl provider
44+
// ClusterctlProvider returns Provider structure of the underlying clusterctl provider.
4545
func (r *BootstrapProviderReconciler) ClusterctlProvider(provider *operatorv1.BootstrapProvider) *clusterctlv1.Provider {
46-
clusterctlProvider := &clusterctlv1.Provider{ObjectMeta: metav1.ObjectMeta{
47-
Name: "bootstrap-" + provider.GetName(),
48-
Namespace: provider.GetNamespace(),
49-
},
46+
clusterctlProvider := &clusterctlv1.Provider{
47+
ObjectMeta: metav1.ObjectMeta{
48+
Name: "bootstrap-" + provider.GetName(),
49+
Namespace: provider.GetNamespace(),
50+
},
5051
Type: string(r.ClusterctlProviderType()),
5152
ProviderName: provider.GetName(),
5253
Version: *util.Or(provider.GetStatus().InstalledVersion, ptr.To("")),
@@ -55,7 +56,7 @@ func (r *BootstrapProviderReconciler) ClusterctlProvider(provider *operatorv1.Bo
5556
return clusterctlProvider
5657
}
5758

58-
// ProviderList returns empty typed list for provider
59+
// GetProviderList returns empty typed list for provider.
5960
func (r *BootstrapProviderReconciler) GetProviderList() generic.ProviderList {
6061
return &operatorv1.BootstrapProviderList{}
6162
}

‎internal/controller/providers/control_plane.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,18 @@ func NewControlPlaneProviderReconciler(conn generic.Connector) generic.ProviderR
3535
}
3636
}
3737

38-
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider
38+
// ClusterctlProviderType returns ProviderType for the underlying clusterctl provider.
3939
func (r *ControlPlaneProviderReconciler) ClusterctlProviderType() clusterctlv1.ProviderType {
4040
return clusterctlv1.ControlPlaneProviderType
4141
}
4242

43-
// ClusterctlProvider returns Provider stucture of the underlying clusterctl provider
43+
// ClusterctlProvider returns Provider structure of the underlying clusterctl provider.
4444
func (r *ControlPlaneProviderReconciler) ClusterctlProvider(provider *operatorv1.ControlPlaneProvider) *clusterctlv1.Provider {
45-
clusterctlProvider := &clusterctlv1.Provider{ObjectMeta: metav1.ObjectMeta{
46-
Name: "control-plane-" + provider.GetName(),
47-
Namespace: provider.GetNamespace(),
48-
},
45+
clusterctlProvider := &clusterctlv1.Provider{
46+
ObjectMeta: metav1.ObjectMeta{
47+
Name: "control-plane-" + provider.GetName(),
48+
Namespace: provider.GetNamespace(),
49+
},
4950
Type: string(r.ClusterctlProviderType()),
5051
ProviderName: provider.GetName(),
5152
Version: *util.Or(provider.GetStatus().InstalledVersion, ptr.To("")),
@@ -54,7 +55,7 @@ func (r *ControlPlaneProviderReconciler) ClusterctlProvider(provider *operatorv1
5455
return clusterctlProvider
5556
}
5657

57-
// ProviderList returns empty typed list for provider
58+
// GetProviderList returns empty typed list for provider.
5859
func (r *ControlPlaneProviderReconciler) GetProviderList() generic.ProviderList {
5960
return &operatorv1.ControlPlaneProviderList{}
6061
}

0 commit comments

Comments
 (0)