Skip to content

Commit 0e82535

Browse files
committed
address linter issues
1 parent 1b79b3d commit 0e82535

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

test/integration/prometheus/prometheus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func SelectMetric(metrics map[string]*io_prometheus_client.MetricFamily, name st
8686
// GetMetric is a convenience function to issue a web request to the specified url and then
8787
// select a particular metric that exactly matches the name and labels. The metric is then returned
8888
// and values can be retrieved based on what type of metric it is, for example .GetCounter().GetValue()
89-
func GetMetric(url string, name string, labels map[string]string) (*io_prometheus_client.Metric, error) {
89+
func GetMetric(url, name string, labels map[string]string) (*io_prometheus_client.Metric, error) {
9090
metrics, err := GetMetrics(url)
9191
if err != nil {
9292
return nil, err

test/integration/prometheus/prometheus_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestGetMetricValue(t *testing.T) {
119119
require.Error(t, err)
120120
} else {
121121
require.NoError(t, err)
122-
require.Equal(t, tt.expectedVal, val)
122+
require.InDelta(t, tt.expectedVal, val, 0.01)
123123
}
124124
})
125125
}

test/internal/kubernetes/utils.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func MustSetUpRBAC(ctx context.Context, clientset *kubernetes.Clientset, rolePat
203203
mustCreateRoleBinding(ctx, roleBindings, roleBinding)
204204
}
205205

206-
func MustSetupConfigMap(ctx context.Context, clientset *kubernetes.Clientset, configMapPath string) (corev1.ConfigMap, func()) {
206+
func MustSetupConfigMap(ctx context.Context, clientset *kubernetes.Clientset, configMapPath string) (corev1.ConfigMap, func()) { // nolint
207207
cm := mustParseConfigMap(configMapPath)
208208
configmaps := clientset.CoreV1().ConfigMaps(cm.Namespace)
209209
mustCreateConfigMap(ctx, configmaps, cm)
@@ -214,7 +214,7 @@ func MustSetupConfigMap(ctx context.Context, clientset *kubernetes.Clientset, co
214214

215215
// MustSetupDaemonset is a convenience function to directly apply the daemonset at dsPath to the cluster,
216216
// returning the parsed daemonset struct and a cleanup function in the process
217-
func MustSetupDaemonset(ctx context.Context, clientset *kubernetes.Clientset, dsPath string) (appsv1.DaemonSet, func()) {
217+
func MustSetupDaemonset(ctx context.Context, clientset *kubernetes.Clientset, dsPath string) (appsv1.DaemonSet, func()) { // nolint
218218
ds := MustParseDaemonSet(dsPath)
219219
dsClient := clientset.AppsV1().DaemonSets(ds.Namespace)
220220
MustCreateDaemonset(ctx, dsClient, ds)
@@ -223,7 +223,7 @@ func MustSetupDaemonset(ctx context.Context, clientset *kubernetes.Clientset, ds
223223
}
224224
}
225225

226-
func MustSetupDeployment(ctx context.Context, clientset *kubernetes.Clientset, depPath string) (appsv1.Deployment, func()) {
226+
func MustSetupDeployment(ctx context.Context, clientset *kubernetes.Clientset, depPath string) (appsv1.Deployment, func()) { // nolint
227227
dep := MustParseDeployment(depPath)
228228
depClient := clientset.AppsV1().Deployments(dep.Namespace)
229229
MustCreateDeployment(ctx, depClient, dep)
@@ -232,7 +232,7 @@ func MustSetupDeployment(ctx context.Context, clientset *kubernetes.Clientset, d
232232
}
233233
}
234234

235-
func MustSetupServiceAccount(ctx context.Context, clientset *kubernetes.Clientset, serviceAccountPath string) (corev1.ServiceAccount, func()) {
235+
func MustSetupServiceAccount(ctx context.Context, clientset *kubernetes.Clientset, serviceAccountPath string) (corev1.ServiceAccount, func()) { // nolint
236236
sa := mustParseServiceAccount(serviceAccountPath)
237237
sas := clientset.CoreV1().ServiceAccounts(sa.Namespace)
238238
mustCreateServiceAccount(ctx, sas, sa)
@@ -241,7 +241,7 @@ func MustSetupServiceAccount(ctx context.Context, clientset *kubernetes.Clientse
241241
}
242242
}
243243

244-
func MustSetupService(ctx context.Context, clientset *kubernetes.Clientset, servicePath string) (corev1.Service, func()) {
244+
func MustSetupService(ctx context.Context, clientset *kubernetes.Clientset, servicePath string) (corev1.Service, func()) { // nolint
245245
svc := mustParseService(servicePath)
246246
svcs := clientset.CoreV1().Services(svc.Namespace)
247247
mustCreateService(ctx, svcs, svc)
@@ -250,7 +250,7 @@ func MustSetupService(ctx context.Context, clientset *kubernetes.Clientset, serv
250250
}
251251
}
252252

253-
func MustSetupLRP(ctx context.Context, clientset *cilium.Clientset, lrpPath string) (ciliumv2.CiliumLocalRedirectPolicy, func()) {
253+
func MustSetupLRP(ctx context.Context, clientset *cilium.Clientset, lrpPath string) (ciliumv2.CiliumLocalRedirectPolicy, func()) { // nolint
254254
lrp := mustParseLRP(lrpPath)
255255
lrps := clientset.CiliumV2().CiliumLocalRedirectPolicies(lrp.Namespace)
256256
mustCreateCiliumLocalRedirectPolicy(ctx, lrps, lrp)

0 commit comments

Comments
 (0)