Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbolt35 committed Mar 24, 2021
2 parents e6e3e51 + 4f7d324 commit b6dcb87
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 495 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN set -e ;\
-ldflags "-X main.gitCommit=${GIT_COMMIT}${GIT_DIRTY}" \
-o /go/bin/app

FROM alpine:3.10.2
FROM alpine:latest
RUN apk add --update --no-cache ca-certificates
COPY --from=build-env /go/bin/app /go/bin/app

Expand Down
42 changes: 11 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,16 @@ module github.com/kubecost/cluster-turndown
go 1.16

require (
cloud.google.com/go v0.80.0
github.com/aws/aws-sdk-go v1.38.3
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/go-openapi/spec v0.20.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.2.0
github.com/googleapis/gnostic v0.5.4 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826 // indirect
golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 // indirect
golang.org/x/sys v0.0.0-20210324051608-47abb6519492 // indirect
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/genproto v0.0.0-20210323160006-e668133fea6a
google.golang.org/grpc v1.36.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.5
k8s.io/apimachinery v0.20.5
k8s.io/client-go v0.20.5
k8s.io/code-generator v0.20.5
k8s.io/gengo v0.0.0-20210203185629-de9496dff47b // indirect
cloud.google.com/go v0.46.3
github.com/aws/aws-sdk-go v1.28.7
github.com/google/uuid v1.1.1
github.com/imdario/mergo v0.3.8 // indirect
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51
google.golang.org/grpc v1.21.1
k8s.io/api v0.0.0-20190913080256-21721929cffa
k8s.io/apimachinery v0.0.0-20190913075812-e119e5e154b6
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
k8s.io/code-generator v0.17.3
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/kube-openapi v0.0.0-20210323165736-1a6458611d18 // indirect
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
sigs.k8s.io/yaml v1.2.0
sigs.k8s.io/yaml v1.1.0
)
Loading

0 comments on commit b6dcb87

Please sign in to comment.