Skip to content

Commit d7e1d61

Browse files
authored
Merge pull request #86 from prachidamle/drop_vendor_bump_go
Drop vendor and bump go version
2 parents 106b488 + 33006c6 commit d7e1d61

File tree

2,574 files changed

+6
-924860
lines changed

Some content is hidden

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

2,574 files changed

+6
-924860
lines changed

Dockerfile.dapper

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13.4-alpine3.10
1+
FROM golang:1.15.7-alpine3.12
22

33
ARG DAPPER_HOST_ARCH
44
ENV ARCH $DAPPER_HOST_ARCH
@@ -14,10 +14,9 @@ RUN mkdir -p /go/src/golang.org/x && \
1414
go install golang.org/x/tools/cmd/goimports
1515
RUN rm -rf /go/src /go/pkg
1616
RUN if [ "${ARCH}" == "amd64" ]; then \
17-
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \
17+
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.27.0; \
1818
fi
1919

20-
ENV GO111MODULE off
2120
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
2221
ENV DAPPER_SOURCE /go/src/github.com/rancher/cis-operator/
2322
ENV DAPPER_OUTPUT ./bin ./dist

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/rancher/cis-operator
22

3-
go 1.13
3+
go 1.15
44

55
replace k8s.io/client-go => k8s.io/client-go v0.19.2
66

@@ -11,7 +11,7 @@ require (
1111
github.com/prometheus/client_golang v1.8.0
1212
github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1fb3
1313
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0
14-
github.com/rancher/security-scan v0.2.2-rc2
14+
github.com/rancher/security-scan v0.2.2
1515
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224
1616
github.com/robfig/cron v1.2.0
1717
github.com/sirupsen/logrus v1.6.0

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,10 +1021,8 @@ github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1f
10211021
github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1fb3/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
10221022
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0 h1:ng7i8n0kzTGnXyvVK+nkb+sLm06BBNdsbd2aqJAP3lM=
10231023
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0/go.mod h1:OhBBBO1pBwYp0hacWdnvSGOj+XE9yMLOLnaypIlic18=
1024-
github.com/rancher/security-scan v0.2.2-0.20201117171930-af478b83fbe4 h1:WRfe56iR0TfelgaNgT01bL5TXmz4KFF55gyUna0cOGQ=
1025-
github.com/rancher/security-scan v0.2.2-0.20201117171930-af478b83fbe4/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
1026-
github.com/rancher/security-scan v0.2.2-rc2 h1:R791mqsUy0sUZNzKqaZeW2D+s/RpCdF6Y1aSQlipees=
1027-
github.com/rancher/security-scan v0.2.2-rc2/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
1024+
github.com/rancher/security-scan v0.2.2 h1:AF0WvyuDQjST86HucySsA5MKlf3RRIgrXyTyReVwkLw=
1025+
github.com/rancher/security-scan v0.2.2/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
10281026
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224 h1:NWYSyS1YiWJOB84xq0FcGDY8xQQwrfKoip2BjMSlu1g=
10291027
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224/go.mod h1:I7qe4DZNMOLKVa9ax7DJdBZ0XtKOppLF/dalhPX3vaE=
10301028
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

vendor/github.com/aquasecurity/kube-bench/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

vendor/github.com/aquasecurity/kube-bench/NOTICE

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)