Skip to content

Commit b97ebda

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #606 from joelanford/go-1.13
⚠️ Bump to Go 1.13
2 parents 9ed8996 + a304b09 commit b97ebda

File tree

11 files changed

+29
-27
lines changed

11 files changed

+29
-27
lines changed

‎hack/check-everything.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,18 @@ function is_installed {
7070
return 1
7171
}
7272

73+
function golangci_lint_has_version {
74+
# Trim "v" from version prefix since golangci-lint --version
75+
# sometimes does not include it, depending on how it's built
76+
golangci-lint --version | grep --quiet --fixed-strings "${1#"v"}"
77+
}
78+
7379
function fetch_go_tools {
74-
header_text "Checking for gometalinter.v2"
75-
if ! is_installed golangci-lint; then
80+
header_text "Checking for golangci-lint"
81+
local golangci_lint_version="v1.21.0"
82+
if ! is_installed golangci-lint || ! golangci_lint_has_version "${golangci_lint_version}"; then
7683
header_text "Installing golangci-lint"
77-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0
84+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin "${golangci_lint_version}"
7885
fi
7986
}
8087

‎hack/ci-check-everything.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,10 @@
1616

1717
set -e
1818

19-
export GO111MODULE=on
2019
export TRACE=1
2120

2221
# Not included or existing by default in Prow
2322
export PATH=$(go env GOPATH)/bin:$PATH
2423
mkdir -p $(go env GOPATH)/bin
2524

26-
echo "Installing golangci-lint"
27-
curl --location --silent --retry 5 --fail https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
28-
echo "Finished installing golangci-lint"
29-
3025
$(dirname ${BASH_SOURCE})/check-everything.sh

‎pkg/client/apiutil/dynamicrestmapper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ limitations under the License.
1717
package apiutil
1818

1919
import (
20+
"errors"
2021
"sync"
2122
"time"
2223

2324
"golang.org/x/time/rate"
24-
"golang.org/x/xerrors"
2525
"k8s.io/apimachinery/pkg/api/meta"
2626
"k8s.io/apimachinery/pkg/runtime/schema"
2727
"k8s.io/client-go/discovery"
@@ -45,7 +45,7 @@ func (e ErrRateLimited) Error() string {
4545
// time.Duration value and false are returned if err is not a ErrRateLimited.
4646
func DelayIfRateLimited(err error) (time.Duration, bool) {
4747
var rlerr ErrRateLimited
48-
if xerrors.As(err, &rlerr) {
48+
if errors.As(err, &rlerr) {
4949
return rlerr.Delay, true
5050
}
5151
return 0, false
@@ -182,7 +182,7 @@ func (drm *dynamicRESTMapper) checkAndReload(needsReloadErr error, checkNeedsRel
182182
// NB(directxman12): `Is` and `As` have a confusing relationship --
183183
// `Is` is like `== or does this implement .Is`, whereas `As` says
184184
// `can I type-assert into`
185-
needsReload := xerrors.As(err, &needsReloadErr)
185+
needsReload := errors.As(err, &needsReloadErr)
186186
if !needsReload {
187187
return err
188188
}
@@ -193,7 +193,7 @@ func (drm *dynamicRESTMapper) checkAndReload(needsReloadErr error, checkNeedsRel
193193

194194
// ... and double-check that we didn't reload in the meantime
195195
err = checkNeedsReload()
196-
needsReload = xerrors.As(err, &needsReloadErr)
196+
needsReload = errors.As(err, &needsReloadErr)
197197
if !needsReload {
198198
return err
199199
}

‎pkg/client/apiutil/dynamicrestmapper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package apiutil_test
22

33
import (
4+
"errors"
45
"time"
56

67
. "github.com/onsi/ginkgo"
78
. "github.com/onsi/gomega"
89
"golang.org/x/time/rate"
9-
"golang.org/x/xerrors"
1010
"k8s.io/apimachinery/pkg/api/meta"
1111
"k8s.io/apimachinery/pkg/runtime/schema"
1212

@@ -82,7 +82,7 @@ var _ = Describe("Dynamic REST Mapper", func() {
8282

8383
By("calling another time that would need a requery and failing")
8484
Eventually(func() bool {
85-
return xerrors.As(callWithTarget(), &apiutil.ErrRateLimited{})
85+
return errors.As(callWithTarget(), &apiutil.ErrRateLimited{})
8686
}, "10s").Should(BeTrue())
8787
})
8888

‎pkg/client/fake/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewFakeClientWithScheme(clientScheme *runtime.Scheme, initObjs ...runtime.O
6262
for _, obj := range initObjs {
6363
err := tracker.Add(obj)
6464
if err != nil {
65-
panic(fmt.Errorf("failed to add object %v to fake client: %v", obj, err))
65+
panic(fmt.Errorf("failed to add object %v to fake client: %w", obj, err))
6666
}
6767
}
6868
return &fakeClient{

‎pkg/envtest/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (te *Environment) Start() (*rest.Config, error) {
214214
}
215215

216216
if err := te.defaultTimeouts(); err != nil {
217-
return nil, fmt.Errorf("failed to default controlplane timeouts: %v", err)
217+
return nil, fmt.Errorf("failed to default controlplane timeouts: %w", err)
218218
}
219219
te.ControlPlane.Etcd.StartTimeout = te.ControlPlaneStartTimeout
220220
te.ControlPlane.Etcd.StopTimeout = te.ControlPlaneStopTimeout
@@ -256,7 +256,7 @@ func (te *Environment) startControlPlane() error {
256256
log.Error(err, "unable to start the controlplane", "tries", numTries)
257257
}
258258
if numTries == maxRetries {
259-
return fmt.Errorf("failed to start the controlplane. retried %d times: %v", numTries, err)
259+
return fmt.Errorf("failed to start the controlplane. retried %d times: %w", numTries, err)
260260
}
261261
return nil
262262
}

‎pkg/internal/recorder/recorder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type provider struct {
4242
func NewProvider(config *rest.Config, scheme *runtime.Scheme, logger logr.Logger, broadcaster record.EventBroadcaster) (recorder.Provider, error) {
4343
clientSet, err := kubernetes.NewForConfig(config)
4444
if err != nil {
45-
return nil, fmt.Errorf("failed to init clientSet: %v", err)
45+
return nil, fmt.Errorf("failed to init clientSet: %w", err)
4646
}
4747

4848
p := &provider{scheme: scheme, logger: logger, eventBroadcaster: broadcaster}

‎pkg/leaderelection/leader_election.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func NewResourceLock(config *rest.Config, recorderProvider recorder.Provider, op
6363
var err error
6464
options.LeaderElectionNamespace, err = getInClusterNamespace()
6565
if err != nil {
66-
return nil, fmt.Errorf("unable to find leader election namespace: %v", err)
66+
return nil, fmt.Errorf("unable to find leader election namespace: %w", err)
6767
}
6868
}
6969

@@ -99,13 +99,13 @@ func getInClusterNamespace() (string, error) {
9999
if os.IsNotExist(err) {
100100
return "", fmt.Errorf("not running in-cluster, please specify LeaderElectionNamespace")
101101
} else if err != nil {
102-
return "", fmt.Errorf("error checking namespace file: %v", err)
102+
return "", fmt.Errorf("error checking namespace file: %w", err)
103103
}
104104

105105
// Load the namespace file and return its content
106106
namespace, err := ioutil.ReadFile(inClusterNamespacePath)
107107
if err != nil {
108-
return "", fmt.Errorf("error reading namespace file: %v", err)
108+
return "", fmt.Errorf("error reading namespace file: %w", err)
109109
}
110110
return string(namespace), nil
111111
}

‎pkg/metrics/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewListener(addr string) (net.Listener, error) {
4040
log.Info("metrics server is starting to listen", "addr", addr)
4141
ln, err := net.Listen("tcp", addr)
4242
if err != nil {
43-
er := fmt.Errorf("error listening on %s: %v", addr, err)
43+
er := fmt.Errorf("error listening on %s: %w", addr, err)
4444
log.Error(er, "metrics server failed to listen. You may want to disable the metrics server or use another port if it is due to conflicts")
4545
return nil, er
4646
}

‎pkg/webhook/admission/multi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (hs multiMutating) Handle(ctx context.Context, req Request) Response {
4747
var err error
4848
marshaledPatch, err := json.Marshal(patches)
4949
if err != nil {
50-
return Errored(http.StatusBadRequest, fmt.Errorf("error when marshaling the patch: %v", err))
50+
return Errored(http.StatusBadRequest, fmt.Errorf("error when marshaling the patch: %w", err))
5151
}
5252
return Response{
5353
AdmissionResponse: admissionv1beta1.AdmissionResponse{

‎pkg/webhook/conversion/conversion.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ func (wh *Webhook) convertViaHub(src, dst conversion.Convertible) error {
161161

162162
err = src.ConvertTo(hub)
163163
if err != nil {
164-
return fmt.Errorf("%T failed to convert to hub version %T : %v", src, hub, err)
164+
return fmt.Errorf("%T failed to convert to hub version %T : %w", src, hub, err)
165165
}
166166

167167
err = dst.ConvertFrom(hub)
168168
if err != nil {
169-
return fmt.Errorf("%T failed to convert from hub version %T : %v", dst, hub, err)
169+
return fmt.Errorf("%T failed to convert from hub version %T : %w", dst, hub, err)
170170
}
171171

172172
return nil
@@ -187,7 +187,7 @@ func (wh *Webhook) getHub(obj runtime.Object) (conversion.Hub, error) {
187187
for _, gvk := range gvks {
188188
instance, err := wh.scheme.New(gvk)
189189
if err != nil {
190-
return nil, fmt.Errorf("failed to allocate an instance for gvk %v %v", gvk, err)
190+
return nil, fmt.Errorf("failed to allocate an instance for gvk %v: %w", gvk, err)
191191
}
192192
if val, isHub := instance.(conversion.Hub); isHub {
193193
if hubFoundAlready {
@@ -237,7 +237,7 @@ func IsConvertible(scheme *runtime.Scheme, obj runtime.Object) (bool, error) {
237237
for _, gvk := range gvks {
238238
instance, err := scheme.New(gvk)
239239
if err != nil {
240-
return false, fmt.Errorf("failed to allocate an instance for gvk %v %v", gvk, err)
240+
return false, fmt.Errorf("failed to allocate an instance for gvk %v: %w", gvk, err)
241241
}
242242

243243
if isHub(instance) {

0 commit comments

Comments
 (0)