Skip to content

Commit 7186ada

Browse files
committed
switch to go modules
1 parent 5018bd7 commit 7186ada

File tree

7 files changed

+177
-276
lines changed

7 files changed

+177
-276
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/golang:1.13.3
5+
- image: circleci/golang:1.14
66
working_directory: /go/src/github.com/databus23/helm-diff
77
steps:
88
- checkout

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
HELM_HOME ?= $(shell helm home)
2-
HAS_GLIDE := $(shell command -v glide;)
32
VERSION := $(shell sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' plugin.yaml)
43

54
PKG:= github.com/databus23/helm-diff
65
LDFLAGS := -X $(PKG)/cmd.Version=$(VERSION)
76

87
# Clear the "unreleased" string in BuildMetadata
98
LDFLAGS += -X $(PKG)/vendor/k8s.io/helm/pkg/version.BuildMetadata=
10-
LDFLAGS += -X $(PKG)/vendor/k8s.io/helm/pkg/version.Version=$(shell grep -A1 "package: k8s.io/helm" glide.yaml | sed -n -e 's/[ ]*version:.*\(v[.0-9]*\).*/\1/p')
9+
LDFLAGS += -X $(PKG)/vendor/k8s.io/helm/pkg/version.Version=$(shell grep -A1 "package: k8s.io/helm" go.mod | sed -n -e 's/[ ]*version:.*\(v[.0-9]*\).*/\1/p')
1110

1211
.PHONY: format
1312
format:
@@ -38,11 +37,8 @@ test:
3837

3938
.PHONY: bootstrap
4039
bootstrap:
41-
ifndef HAS_GLIDE
42-
go get -u github.com/Masterminds/glide
43-
endif
44-
glide install --strip-vendor
45-
command -v golint || go get -u golang.org/x/lint/golint
40+
go mod download
41+
command -v golint || GO111MODULE=off go get -u golang.org/x/lint/golint
4642

4743
.PHONY: docker-run-release
4844
docker-run-release: export pkg=/go/src/github.com/databus23/helm-diff

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,6 @@ The above will install this plugin into your `$HELM_HOME/plugins` directory.
220220
### Prerequisites
221221

222222
- You need to have [Go](http://golang.org) installed. Make sure to set `$GOPATH`
223-
- If you don't have [Glide](http://glide.sh) installed, this will install it into
224-
`$GOPATH/bin` for you.
225223

226224
### Running Tests
227225
Automated tests are implemented with [*testing*](https://golang.org/pkg/testing/).

glide.lock

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

glide.yaml

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

go.mod

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
module github.com/databus23/helm-diff
2+
3+
go 1.14
4+
5+
require (
6+
github.com/Masterminds/goutils v1.1.0 // indirect
7+
github.com/Masterminds/semver v1.3.1
8+
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
9+
github.com/aryann/difflib v0.0.0-20170226194404-a1a4dd44eb11
10+
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680
11+
github.com/gobwas/glob v0.2.3 // indirect
12+
github.com/gogo/protobuf v1.3.1 // indirect
13+
github.com/golang/protobuf v1.3.4 // indirect
14+
github.com/google/gofuzz v1.1.0 // indirect
15+
github.com/google/uuid v1.1.1 // indirect
16+
github.com/huandu/xstrings v1.3.0 // indirect
17+
github.com/imdario/mergo v0.3.8 // indirect
18+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
19+
github.com/json-iterator/go v1.1.9 // indirect
20+
github.com/mattn/go-colorable v0.1.6 // indirect
21+
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
22+
github.com/mitchellh/copystructure v1.0.0 // indirect
23+
github.com/spf13/cobra v0.0.3-0.20180412120829-615425954c3b
24+
github.com/spf13/pflag v1.0.1
25+
github.com/stretchr/testify v1.5.1
26+
golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 // indirect
27+
golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
28+
google.golang.org/grpc v1.28.0
29+
gopkg.in/inf.v0 v0.9.1 // indirect
30+
gopkg.in/yaml.v2 v2.2.2
31+
k8s.io/api v0.0.0-20180712090710-2d6f90ab1293
32+
k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d
33+
k8s.io/client-go v0.0.0-20180718001006-59698c7d9724
34+
k8s.io/helm v2.11.0+incompatible
35+
)

0 commit comments

Comments
 (0)