diff --git a/internal/store/cronjob.go b/internal/store/cronjob.go index 5c1465381c..1450f70c4c 100644 --- a/internal/store/cronjob.go +++ b/internal/store/cronjob.go @@ -36,7 +36,7 @@ import ( ) var ( - descCronJobAnnotationsName = "kube_cronjob_annotations" + descCronJobAnnotationsName = "kube_cronjob_annotations" //nolint:gosec descCronJobAnnotationsHelp = "Kubernetes annotations converted to Prometheus labels." descCronJobLabelsName = "kube_cronjob_labels" descCronJobLabelsHelp = "Kubernetes labels converted to Prometheus labels." diff --git a/internal/store/ingress.go b/internal/store/ingress.go index 1d27f72a25..be98e25aa1 100644 --- a/internal/store/ingress.go +++ b/internal/store/ingress.go @@ -34,7 +34,7 @@ import ( ) var ( - descIngressAnnotationsName = "kube_ingress_annotations" + descIngressAnnotationsName = "kube_ingress_annotations" //nolint:gosec descIngressAnnotationsHelp = "Kubernetes annotations converted to Prometheus labels." descIngressLabelsName = "kube_ingress_labels" descIngressLabelsHelp = "Kubernetes labels converted to Prometheus labels." diff --git a/internal/store/ingressclass.go b/internal/store/ingressclass.go index 0aaa8e13e2..ec7a0f7d71 100644 --- a/internal/store/ingressclass.go +++ b/internal/store/ingressclass.go @@ -32,7 +32,7 @@ import ( var ( descIngressClassAnnotationsName = "kube_ingressclass_annotations" descIngressClassAnnotationsHelp = "Kubernetes annotations converted to Prometheus labels." - descIngressClassLabelsName = "kube_ingressclass_labels" + descIngressClassLabelsName = "kube_ingressclass_labels" //nolint:gosec descIngressClassLabelsHelp = "Kubernetes labels converted to Prometheus labels." descIngressClassLabelsDefaultLabels = []string{"ingressclass"} ) diff --git a/internal/store/persistentvolume_test.go b/internal/store/persistentvolume_test.go index b4e0e15f74..4ff4750d72 100644 --- a/internal/store/persistentvolume_test.go +++ b/internal/store/persistentvolume_test.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" generator "k8s.io/kube-state-metrics/v2/pkg/metric_generator" ) @@ -415,7 +415,7 @@ func TestPersistentVolumeStore(t *testing.T) { Spec: v1.PersistentVolumeSpec{ PersistentVolumeSource: v1.PersistentVolumeSource{ Local: &v1.LocalVolumeSource{ - FSType: pointer.String("ext4"), + FSType: ptr.To("ext4"), Path: "/mnt/data", }, }, diff --git a/internal/store/serviceaccount_test.go b/internal/store/serviceaccount_test.go index 1223a5b6af..d6d9df3b32 100644 --- a/internal/store/serviceaccount_test.go +++ b/internal/store/serviceaccount_test.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" generator "k8s.io/kube-state-metrics/v2/pkg/metric_generator" ) @@ -38,7 +38,7 @@ func TestServiceAccountStore(t *testing.T) { Namespace: "serviceAccountNS", UID: "serviceAccountUID", }, - AutomountServiceAccountToken: pointer.Bool(true), + AutomountServiceAccountToken: ptr.To(true), Secrets: []v1.ObjectReference{ { APIVersion: "v1", diff --git a/pkg/customresourcestate/custom_resource_metrics_test.go b/pkg/customresourcestate/custom_resource_metrics_test.go index e62e333c1c..928f668ddd 100644 --- a/pkg/customresourcestate/custom_resource_metrics_test.go +++ b/pkg/customresourcestate/custom_resource_metrics_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func TestNewCustomResourceMetrics(t *testing.T) { @@ -130,7 +130,7 @@ func TestNewCustomResourceMetrics(t *testing.T) { }, }, }, - MetricNamePrefix: pointer.String("apps_deployment"), + MetricNamePrefix: ptr.To("apps_deployment"), }, wantErr: false, wantResult: &customResourceMetrics{ @@ -193,7 +193,7 @@ func TestNewCustomResourceMetrics(t *testing.T) { }, }, }, - MetricNamePrefix: pointer.String("apps_deployment"), + MetricNamePrefix: ptr.To("apps_deployment"), }, wantErr: true, wantResult: &customResourceMetrics{ diff --git a/pkg/customresourcestate/registry_factory_test.go b/pkg/customresourcestate/registry_factory_test.go index 3d53c696fd..a0432ec0bd 100644 --- a/pkg/customresourcestate/registry_factory_test.go +++ b/pkg/customresourcestate/registry_factory_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "k8s.io/kube-state-metrics/v2/pkg/metric" ) @@ -454,7 +454,7 @@ func Test_fullName(t *testing.T) { { name: "no prefix", args: args{ - resource: r(pointer.String("")), + resource: r(ptr.To("")), f: count, }, want: "count", @@ -462,7 +462,7 @@ func Test_fullName(t *testing.T) { { name: "custom", args: args{ - resource: r(pointer.String("bar_baz")), + resource: r(ptr.To("bar_baz")), f: count, }, want: "bar_baz_count", diff --git a/pkg/options/types_test.go b/pkg/options/types_test.go index 3ccaf4c0e4..a1b43a2c0b 100644 --- a/pkg/options/types_test.go +++ b/pkg/options/types_test.go @@ -109,8 +109,8 @@ func TestNamespaceList_GetNamespaces(t *testing.T) { }, } - for _, test := range tests { - ns := &test.Namespaces + for i, test := range tests { + ns := &tests[i].Namespaces allowedNamespaces := ns.GetNamespaces() if !reflect.DeepEqual(allowedNamespaces, test.Wanted) { t.Errorf("Test error for Desc: %s. Want: %+v. Got: %+v.", test.Desc, test.Wanted, allowedNamespaces)