Skip to content

Commit 5169b97

Browse files
kyessenovistio-testing
authored andcommitted
update linters (istio#10809)
Signed-off-by: Kuat Yessenov <[email protected]>
1 parent 45b6a79 commit 5169b97

File tree

153 files changed

+428
-420
lines changed

Some content is hidden

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

153 files changed

+428
-420
lines changed

addons/servicegraph/promgen/promgen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"time"
2626

2727
"github.com/prometheus/client_golang/api"
28-
"github.com/prometheus/client_golang/api/prometheus/v1"
28+
v1 "github.com/prometheus/client_golang/api/prometheus/v1"
2929
"github.com/prometheus/common/model"
3030

3131
"istio.io/istio/addons/servicegraph"

bin/linters.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function install_gometalinter() {
8787
}
8888

8989
function install_golangcilint() {
90-
GOLANGCI_VERSION="v1.12.2"
90+
GOLANGCI_VERSION="v1.12.4"
9191
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b "$GOPATH"/bin "$GOLANGCI_VERSION"
9292
golangci-lint --version
9393
}

galley/pkg/crd/validation/endpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package validation
1616

1717
import (
18-
"k8s.io/api/core/v1"
18+
v1 "k8s.io/api/core/v1"
1919
"k8s.io/client-go/tools/cache"
2020
"k8s.io/client-go/util/workqueue"
2121
)

galley/pkg/crd/validation/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"regexp"
2424
"time"
2525

26-
"github.com/hashicorp/go-multierror"
26+
multierror "github.com/hashicorp/go-multierror"
2727

2828
"istio.io/istio/galley/cmd/shared"
2929
"istio.io/istio/mixer/adapter"

galley/pkg/crd/validation/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
admissionv1beta1 "k8s.io/api/admission/v1beta1"
3131
"k8s.io/api/admissionregistration/v1beta1"
3232
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
33-
"k8s.io/apimachinery/pkg/apis/meta/v1"
33+
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3535
"k8s.io/apimachinery/pkg/fields"
3636
"k8s.io/apimachinery/pkg/runtime"

galley/pkg/crd/validation/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/ghodss/yaml"
3131
admissionv1beta1 "k8s.io/api/admission/v1beta1"
3232
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
33-
"k8s.io/api/core/v1"
33+
v1 "k8s.io/api/core/v1"
3434
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

galley/pkg/kube/resourcespec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package kube
1717
import (
1818
"fmt"
1919

20-
"k8s.io/apimachinery/pkg/apis/meta/v1"
20+
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
sc "k8s.io/apimachinery/pkg/runtime/schema"
2222

2323
"istio.io/istio/galley/pkg/kube/converter"

galley/pkg/kube/resourcespec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"reflect"
1919
"testing"
2020

21-
"k8s.io/apimachinery/pkg/apis/meta/v1"
21+
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
sc "k8s.io/apimachinery/pkg/runtime/schema"
2323
)
2424

galley/pkg/kube/source/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"time"
2020

21-
"github.com/hashicorp/go-multierror"
21+
multierror "github.com/hashicorp/go-multierror"
2222
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
2323
"k8s.io/apimachinery/pkg/runtime/schema"
2424
"k8s.io/apimachinery/pkg/util/wait"

galley/pkg/server/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"os"
2121

2222
"github.com/fsnotify/fsnotify"
23-
"gopkg.in/yaml.v2"
23+
yaml "gopkg.in/yaml.v2"
2424

2525
"istio.io/istio/pkg/filewatcher"
2626
"istio.io/istio/pkg/mcp/server"

0 commit comments

Comments
 (0)