Skip to content

Commit

Permalink
Merge pull request #86 from prachidamle/drop_vendor_bump_go
Browse files Browse the repository at this point in the history
Drop vendor and bump go version
  • Loading branch information
prachidamle authored Jan 29, 2021
2 parents 106b488 + 33006c6 commit d7e1d61
Show file tree
Hide file tree
Showing 2,574 changed files with 6 additions and 924,860 deletions.
5 changes: 2 additions & 3 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.4-alpine3.10
FROM golang:1.15.7-alpine3.12

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

ENV GO111MODULE off
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
ENV DAPPER_SOURCE /go/src/github.com/rancher/cis-operator/
ENV DAPPER_OUTPUT ./bin ./dist
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/cis-operator

go 1.13
go 1.15

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

Expand All @@ -11,7 +11,7 @@ require (
github.com/prometheus/client_golang v1.8.0
github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1fb3
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0
github.com/rancher/security-scan v0.2.2-rc2
github.com/rancher/security-scan v0.2.2
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224
github.com/robfig/cron v1.2.0
github.com/sirupsen/logrus v1.6.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1021,10 +1021,8 @@ github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1f
github.com/rancher/kubernetes-provider-detector v0.0.0-20200807181951-690274ab1fb3/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0 h1:ng7i8n0kzTGnXyvVK+nkb+sLm06BBNdsbd2aqJAP3lM=
github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0/go.mod h1:OhBBBO1pBwYp0hacWdnvSGOj+XE9yMLOLnaypIlic18=
github.com/rancher/security-scan v0.2.2-0.20201117171930-af478b83fbe4 h1:WRfe56iR0TfelgaNgT01bL5TXmz4KFF55gyUna0cOGQ=
github.com/rancher/security-scan v0.2.2-0.20201117171930-af478b83fbe4/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
github.com/rancher/security-scan v0.2.2-rc2 h1:R791mqsUy0sUZNzKqaZeW2D+s/RpCdF6Y1aSQlipees=
github.com/rancher/security-scan v0.2.2-rc2/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
github.com/rancher/security-scan v0.2.2 h1:AF0WvyuDQjST86HucySsA5MKlf3RRIgrXyTyReVwkLw=
github.com/rancher/security-scan v0.2.2/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224 h1:NWYSyS1YiWJOB84xq0FcGDY8xQQwrfKoip2BjMSlu1g=
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224/go.mod h1:I7qe4DZNMOLKVa9ax7DJdBZ0XtKOppLF/dalhPX3vaE=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
Expand Down
202 changes: 0 additions & 202 deletions vendor/github.com/aquasecurity/kube-bench/LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/aquasecurity/kube-bench/NOTICE

This file was deleted.

Loading

0 comments on commit d7e1d61

Please sign in to comment.