Skip to content

Commit

Permalink
*: move to go 1.12 and go modules
Browse files Browse the repository at this point in the history
  • Loading branch information
paulfantom committed Jun 3, 2019
1 parent efcaf7d commit 0153f20
Show file tree
Hide file tree
Showing 607 changed files with 8,938 additions and 105,453 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM openshift/origin-release:golang-1.10
FROM openshift/origin-release:golang-1.12
COPY . /go/src/github.com/openshift/telemeter
RUN cd /go/src/github.com/openshift/telemeter && \
go build ./cmd/telemeter-client && \
Expand All @@ -8,4 +8,4 @@ RUN cd /go/src/github.com/openshift/telemeter && \
FROM centos:7
COPY --from=0 /go/src/github.com/openshift/telemeter/telemeter-client /usr/bin/
COPY --from=0 /go/src/github.com/openshift/telemeter/telemeter-server /usr/bin/
COPY --from=0 /go/src/github.com/openshift/telemeter/authorization-server /usr/bin/
COPY --from=0 /go/src/github.com/openshift/telemeter/authorization-server /usr/bin/
4 changes: 3 additions & 1 deletion Makefile
Expand Up @@ -67,7 +67,9 @@ image: .hack-operator-image
##############

vendor:
glide update -v --skip-test
go mod vendor
go mod tidy
go mod verify

.PHONY: generate
generate: $(DOCS) manifests
Expand Down
26 changes: 26 additions & 0 deletions go.mod
@@ -0,0 +1,26 @@
module github.com/openshift/telemeter

go 1.12

require (
github.com/coreos/go-oidc v2.0.0+incompatible
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/golang/protobuf v1.2.0
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db
github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c
github.com/hashicorp/memberlist v0.1.0
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/oklog/run v0.0.0-20180308005104-6934b124db28
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
github.com/prometheus/client_golang v0.9.1
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
github.com/prometheus/common v0.2.0
github.com/prometheus/prometheus v0.0.0-20190131111325-62e591f928dd
github.com/satori/go.uuid v1.2.0
github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908
github.com/spf13/cobra v0.0.3
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
golang.org/x/sys v0.0.0-20190124100055-b90733256f2e // indirect
golang.org/x/time v0.0.0-20170424234030-8be79e1e0910
gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84
)
243 changes: 243 additions & 0 deletions go.sum

Large diffs are not rendered by default.

49 changes: 0 additions & 49 deletions vendor/github.com/alecthomas/units/bytes_test.go

This file was deleted.

133 changes: 0 additions & 133 deletions vendor/github.com/armon/go-metrics/inmem_endpoint_test.go

This file was deleted.

58 changes: 0 additions & 58 deletions vendor/github.com/armon/go-metrics/inmem_signal_test.go

This file was deleted.

0 comments on commit 0153f20

Please sign in to comment.