Skip to content

Commit 1035909

Browse files
mumoshumumoshu
committed
Bump Go to 1.17 and Helm to 3.6.1
Closes #325
1 parent dadd38f commit 1035909

File tree

5 files changed

+461
-181
lines changed

5 files changed

+461
-181
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.14
5+
- image: circleci/golang:1.17
66
working_directory: /go/src/github.com/databus23/helm-diff
77
steps:
88
- checkout

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ curl -L $TARBALL_URL | tar -C $(helm home)/plugins -xzv
3030

3131
### From Source
3232
#### Prerequisites
33-
- GoLang `>= 1.14`
33+
- GoLang `>= 1.17`
3434

3535
Make sure you do not have a verison of `helm-diff` installed. You can remove it by running `helm plugin uninstall diff`
3636

‎cmd/upgrade.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func genManifest(original, target kube.ResourceList) ([]byte, []byte, error) {
318318

319319
// Fetch the current object for the three way merge
320320
helper := resource.NewHelper(info.Client, info.Mapping)
321-
currentObj, err := helper.Get(info.Namespace, info.Name, info.Export)
321+
currentObj, err := helper.Get(info.Namespace, info.Name)
322322
if err != nil {
323323
if !apierrors.IsNotFound(err) {
324324
return errors.Wrap(err, "could not get information about the resource")
@@ -522,7 +522,7 @@ func existingResourceConflict(resources kube.ResourceList) (kube.ResourceList, e
522522
}
523523

524524
helper := resource.NewHelper(info.Client, info.Mapping)
525-
_, err = helper.Get(info.Namespace, info.Name, info.Export)
525+
_, err = helper.Get(info.Namespace, info.Name)
526526
if err != nil {
527527
if apierrors.IsNotFound(err) {
528528
return nil

‎go.mod‎

Lines changed: 123 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/databus23/helm-diff/v3
22

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
88
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a
9-
github.com/evanphx/json-patch v4.2.0+incompatible
9+
github.com/evanphx/json-patch v4.9.0+incompatible
1010
github.com/ghodss/yaml v1.0.0
1111
github.com/huandu/xstrings v1.3.2 // indirect
12-
github.com/json-iterator/go v1.1.8
12+
github.com/json-iterator/go v1.1.10
1313
github.com/mattn/go-colorable v0.1.7 // indirect
1414
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
1515
github.com/pkg/errors v0.9.1
@@ -19,13 +19,127 @@ require (
1919
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
2020
google.golang.org/grpc v1.30.0
2121
gopkg.in/yaml.v2 v2.4.0
22-
helm.sh/helm/v3 v3.3.1
23-
k8s.io/api v0.18.8
24-
k8s.io/apiextensions-apiserver v0.18.8
25-
k8s.io/apimachinery v0.18.8
26-
k8s.io/cli-runtime v0.18.8
27-
k8s.io/client-go v0.18.8
22+
helm.sh/helm/v3 v3.6.1
23+
k8s.io/api v0.21.0
24+
k8s.io/apiextensions-apiserver v0.21.0
25+
k8s.io/apimachinery v0.21.0
26+
k8s.io/cli-runtime v0.21.0
27+
k8s.io/client-go v0.21.0
2828
k8s.io/helm v2.16.12+incompatible
2929
rsc.io/letsencrypt v0.0.3 // indirect
3030
sigs.k8s.io/yaml v1.2.0
3131
)
32+
33+
require (
34+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
35+
github.com/BurntSushi/toml v0.3.1 // indirect
36+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
37+
github.com/Masterminds/goutils v1.1.1 // indirect
38+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
39+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
40+
github.com/Masterminds/squirrel v1.5.0 // indirect
41+
github.com/Microsoft/go-winio v0.4.16 // indirect
42+
github.com/Microsoft/hcsshim v0.8.14 // indirect
43+
github.com/PuerkitoBio/purell v1.1.1 // indirect
44+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
45+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
46+
github.com/beorn7/perks v1.0.1 // indirect
47+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
48+
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
49+
github.com/containerd/containerd v1.4.4 // indirect
50+
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
51+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
52+
github.com/davecgh/go-spew v1.1.1 // indirect
53+
github.com/deislabs/oras v0.11.1 // indirect
54+
github.com/docker/cli v20.10.5+incompatible // indirect
55+
github.com/docker/distribution v2.7.1+incompatible // indirect
56+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
57+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
58+
github.com/docker/go-connections v0.4.0 // indirect
59+
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect
60+
github.com/docker/go-units v0.4.0 // indirect
61+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
62+
github.com/fatih/color v1.7.0 // indirect
63+
github.com/go-errors/errors v1.0.1 // indirect
64+
github.com/go-logr/logr v0.4.0 // indirect
65+
github.com/go-openapi/jsonpointer v0.19.3 // indirect
66+
github.com/go-openapi/jsonreference v0.19.3 // indirect
67+
github.com/go-openapi/spec v0.19.5 // indirect
68+
github.com/go-openapi/swag v0.19.5 // indirect
69+
github.com/gobwas/glob v0.2.3 // indirect
70+
github.com/gogo/protobuf v1.3.2 // indirect
71+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
72+
github.com/golang/protobuf v1.4.3 // indirect
73+
github.com/google/btree v1.0.0 // indirect
74+
github.com/google/go-cmp v0.5.2 // indirect
75+
github.com/google/gofuzz v1.1.0 // indirect
76+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
77+
github.com/google/uuid v1.1.2 // indirect
78+
github.com/googleapis/gnostic v0.4.1 // indirect
79+
github.com/gorilla/mux v1.7.3 // indirect
80+
github.com/gosuri/uitable v0.0.4 // indirect
81+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
82+
github.com/hashicorp/golang-lru v0.5.1 // indirect
83+
github.com/imdario/mergo v0.3.11 // indirect
84+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
85+
github.com/jmoiron/sqlx v1.3.1 // indirect
86+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
87+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
88+
github.com/lib/pq v1.10.0 // indirect
89+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
90+
github.com/mailru/easyjson v0.7.0 // indirect
91+
github.com/mattn/go-isatty v0.0.12 // indirect
92+
github.com/mattn/go-runewidth v0.0.7 // indirect
93+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
94+
github.com/mitchellh/copystructure v1.1.1 // indirect
95+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
96+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
97+
github.com/moby/spdystream v0.2.0 // indirect
98+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
99+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
100+
github.com/modern-go/reflect2 v1.0.1 // indirect
101+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
102+
github.com/morikuni/aec v1.0.0 // indirect
103+
github.com/opencontainers/go-digest v1.0.0 // indirect
104+
github.com/opencontainers/image-spec v1.0.1 // indirect
105+
github.com/opencontainers/runc v0.1.1 // indirect
106+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
107+
github.com/pmezard/go-difflib v1.0.0 // indirect
108+
github.com/prometheus/client_golang v1.7.1 // indirect
109+
github.com/prometheus/client_model v0.2.0 // indirect
110+
github.com/prometheus/common v0.10.0 // indirect
111+
github.com/prometheus/procfs v0.2.0 // indirect
112+
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
113+
github.com/russross/blackfriday v1.5.2 // indirect
114+
github.com/shopspring/decimal v1.2.0 // indirect
115+
github.com/sirupsen/logrus v1.8.1 // indirect
116+
github.com/spf13/cast v1.3.1 // indirect
117+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
118+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
119+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
120+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
121+
go.opencensus.io v0.22.3 // indirect
122+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
123+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
124+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
125+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
126+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
127+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
128+
golang.org/x/text v0.3.4 // indirect
129+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
130+
google.golang.org/appengine v1.6.5 // indirect
131+
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
132+
google.golang.org/protobuf v1.25.0 // indirect
133+
gopkg.in/gorp.v1 v1.7.2 // indirect
134+
gopkg.in/inf.v0 v0.9.1 // indirect
135+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
136+
k8s.io/apiserver v0.21.0 // indirect
137+
k8s.io/component-base v0.21.0 // indirect
138+
k8s.io/klog/v2 v2.8.0 // indirect
139+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
140+
k8s.io/kubectl v0.21.0 // indirect
141+
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
142+
sigs.k8s.io/kustomize/api v0.8.5 // indirect
143+
sigs.k8s.io/kustomize/kyaml v0.10.15 // indirect
144+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
145+
)

0 commit comments

Comments
 (0)