Skip to content

Commit d6bed22

Browse files
tbugfindertbugfinder
tbugfinder
and
tbugfinder
authored
bump go from 1.18 to 1.19 and bump to helm 3.11.3 (#439)
* bump go from 1.17 to 1.19 * bump helm version and dependencies * update circleci image * update working directory to a writeable target * update to helm v3.11.3 --------- Co-authored-by: tbugfinder <tbugfinder@online.ms>
1 parent 1699f76 commit d6bed22

File tree

5 files changed

+327
-317
lines changed

5 files changed

+327
-317
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/golang:1.17
6-
working_directory: /go/src/github.com/databus23/helm-diff
5+
- image: cimg/go:1.19
6+
working_directory: /home/circleci/go/src/github.com/databus23/helm-diff
77
steps:
88
- checkout
99
- run:

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name: CI
33

44
env:
5-
VERSION_GO: '1.18.10'
6-
VERSION_HELM: 'v3.10.3'
5+
VERSION_GO: '1.19.8'
6+
VERSION_HELM: 'v3.11.3'
77

88
on:
99
pull_request:

‎go.mod‎

Lines changed: 68 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,76 @@
11
module github.com/databus23/helm-diff/v3
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a
88
github.com/evanphx/json-patch v5.6.0+incompatible
99
github.com/ghodss/yaml v1.0.0
10+
github.com/huandu/xstrings v1.4.0 // indirect
1011
github.com/json-iterator/go v1.1.12
1112
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
1213
github.com/pkg/errors v0.9.1
13-
github.com/spf13/cobra v1.5.0
14+
github.com/spf13/cobra v1.7.0
1415
github.com/spf13/pflag v1.0.5
15-
github.com/stretchr/testify v1.8.0
16-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
17-
google.golang.org/grpc v1.47.0
16+
github.com/stretchr/testify v1.8.2
17+
golang.org/x/crypto v0.5.0
18+
google.golang.org/grpc v1.53.0
1819
gopkg.in/yaml.v2 v2.4.0
19-
helm.sh/helm/v3 v3.10.3
20-
k8s.io/api v0.25.2
21-
k8s.io/apiextensions-apiserver v0.25.2
22-
k8s.io/apimachinery v0.25.2
23-
k8s.io/cli-runtime v0.25.2
24-
k8s.io/client-go v0.25.2
20+
helm.sh/helm/v3 v3.11.3
21+
k8s.io/api v0.26.2
22+
k8s.io/apiextensions-apiserver v0.26.0
23+
k8s.io/apimachinery v0.26.2
24+
k8s.io/cli-runtime v0.26.0
25+
k8s.io/client-go v0.26.2
2526
k8s.io/helm v2.16.12+incompatible
2627
sigs.k8s.io/yaml v1.3.0
2728
)
2829

29-
require github.com/google/go-cmp v0.5.8
30-
3130
require (
3231
github.com/gonvenience/ytbx v1.4.4
33-
github.com/homeport/dyff v1.5.6
32+
github.com/google/go-cmp v0.5.9
33+
github.com/homeport/dyff v1.5.7
3434
)
3535

3636
require (
37-
cloud.google.com/go v0.99.0 // indirect
37+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
3838
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
39-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
40-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
41-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
42-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
43-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
44-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
45-
github.com/BurntSushi/toml v1.1.0 // indirect
39+
github.com/BurntSushi/toml v1.2.1 // indirect
4640
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4741
github.com/Masterminds/goutils v1.1.1 // indirect
48-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
42+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
4943
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
50-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
44+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
5145
github.com/Masterminds/squirrel v1.5.3 // indirect
52-
github.com/PuerkitoBio/purell v1.1.1 // indirect
53-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
5446
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
5547
github.com/beorn7/perks v1.0.1 // indirect
56-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
48+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5749
github.com/chai2010/gettext-go v1.0.2 // indirect
58-
github.com/containerd/containerd v1.6.18 // indirect
50+
github.com/containerd/containerd v1.7.0 // indirect
5951
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
6052
github.com/davecgh/go-spew v1.1.1 // indirect
61-
github.com/docker/cli v20.10.17+incompatible // indirect
53+
github.com/docker/cli v20.10.21+incompatible // indirect
6254
github.com/docker/distribution v2.8.1+incompatible // indirect
6355
github.com/docker/docker v20.10.24+incompatible // indirect
64-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
56+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
6557
github.com/docker/go-connections v0.4.0 // indirect
6658
github.com/docker/go-metrics v0.0.1 // indirect
67-
github.com/docker/go-units v0.4.0 // indirect
68-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
59+
github.com/docker/go-units v0.5.0 // indirect
60+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
6961
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7062
github.com/fatih/color v1.13.0 // indirect
7163
github.com/go-errors/errors v1.0.1 // indirect
72-
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
73-
github.com/go-logr/logr v1.2.3 // indirect
64+
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
65+
github.com/go-logr/logr v1.2.4 // indirect
66+
github.com/go-logr/stdr v1.2.2 // indirect
7467
github.com/go-openapi/jsonpointer v0.19.5 // indirect
75-
github.com/go-openapi/jsonreference v0.19.5 // indirect
68+
github.com/go-openapi/jsonreference v0.20.0 // indirect
7669
github.com/go-openapi/swag v0.19.14 // indirect
7770
github.com/gobwas/glob v0.2.3 // indirect
7871
github.com/gogo/protobuf v1.3.2 // indirect
79-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
8072
github.com/golang/protobuf v1.5.2 // indirect
81-
github.com/gonvenience/bunt v1.3.4 // indirect
73+
github.com/gonvenience/bunt v1.3.5 // indirect
8274
github.com/gonvenience/neat v1.3.11 // indirect
8375
github.com/gonvenience/term v1.0.2 // indirect
8476
github.com/gonvenience/text v1.0.7 // indirect
@@ -87,25 +79,26 @@ require (
8779
github.com/google/gnostic v0.5.7-v3refs // indirect
8880
github.com/google/gofuzz v1.2.0 // indirect
8981
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
90-
github.com/google/uuid v1.2.0 // indirect
82+
github.com/google/uuid v1.3.0 // indirect
9183
github.com/gorilla/mux v1.8.0 // indirect
9284
github.com/gosuri/uitable v0.0.4 // indirect
9385
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
94-
github.com/huandu/xstrings v1.3.2 // indirect
95-
github.com/imdario/mergo v0.3.12 // indirect
96-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
86+
github.com/hashicorp/errwrap v1.1.0 // indirect
87+
github.com/hashicorp/go-multierror v1.1.1 // indirect
88+
github.com/imdario/mergo v0.3.13 // indirect
89+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9790
github.com/jmoiron/sqlx v1.3.5 // indirect
9891
github.com/josharian/intern v1.0.0 // indirect
99-
github.com/klauspost/compress v1.13.6 // indirect
92+
github.com/klauspost/compress v1.16.0 // indirect
10093
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
10194
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
102-
github.com/lib/pq v1.10.6 // indirect
95+
github.com/lib/pq v1.10.7 // indirect
10396
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
10497
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
10598
github.com/mailru/easyjson v0.7.6 // indirect
10699
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
107-
github.com/mattn/go-colorable v0.1.12 // indirect
108-
github.com/mattn/go-isatty v0.0.14 // indirect
100+
github.com/mattn/go-colorable v0.1.13 // indirect
101+
github.com/mattn/go-isatty v0.0.18 // indirect
109102
github.com/mattn/go-runewidth v0.0.9 // indirect
110103
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
111104
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -115,53 +108,54 @@ require (
115108
github.com/mitchellh/reflectwalk v1.0.2 // indirect
116109
github.com/moby/locker v1.0.1 // indirect
117110
github.com/moby/spdystream v0.2.0 // indirect
118-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
111+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
119112
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
120113
github.com/modern-go/reflect2 v1.0.2 // indirect
121114
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
122115
github.com/morikuni/aec v1.0.0 // indirect
123116
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
124117
github.com/opencontainers/go-digest v1.0.0 // indirect
125-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
118+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
126119
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
127120
github.com/pmezard/go-difflib v1.0.0 // indirect
128-
github.com/prometheus/client_golang v1.12.1 // indirect
129-
github.com/prometheus/client_model v0.2.0 // indirect
130-
github.com/prometheus/common v0.32.1 // indirect
131-
github.com/prometheus/procfs v0.7.3 // indirect
132-
github.com/rubenv/sql-migrate v1.1.2 // indirect
133-
github.com/russross/blackfriday v1.5.2 // indirect
134-
github.com/sergi/go-diff v1.2.0 // indirect
135-
github.com/shopspring/decimal v1.2.0 // indirect
136-
github.com/sirupsen/logrus v1.8.1 // indirect
137-
github.com/spf13/cast v1.4.1 // indirect
121+
github.com/prometheus/client_golang v1.14.0 // indirect
122+
github.com/prometheus/client_model v0.3.0 // indirect
123+
github.com/prometheus/common v0.37.0 // indirect
124+
github.com/prometheus/procfs v0.8.0 // indirect
125+
github.com/rubenv/sql-migrate v1.3.1 // indirect
126+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
127+
github.com/sergi/go-diff v1.3.1 // indirect
128+
github.com/shopspring/decimal v1.3.1 // indirect
129+
github.com/sirupsen/logrus v1.9.0 // indirect
130+
github.com/spf13/cast v1.5.0 // indirect
138131
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
139132
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
140-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
133+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
141134
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
142135
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
143136
github.com/xlab/treeprint v1.1.0 // indirect
144-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
137+
go.opentelemetry.io/otel v1.14.0 // indirect
138+
go.opentelemetry.io/otel/trace v1.14.0 // indirect
145139
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
146-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
147-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
148-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
149-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
150-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
151-
golang.org/x/text v0.3.7 // indirect
140+
golang.org/x/net v0.9.0 // indirect
141+
golang.org/x/oauth2 v0.4.0 // indirect
142+
golang.org/x/sync v0.1.0 // indirect
143+
golang.org/x/sys v0.7.0 // indirect
144+
golang.org/x/term v0.7.0 // indirect
145+
golang.org/x/text v0.9.0 // indirect
152146
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
153147
google.golang.org/appengine v1.6.7 // indirect
154-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
155-
google.golang.org/protobuf v1.28.0 // indirect
148+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
149+
google.golang.org/protobuf v1.28.1 // indirect
156150
gopkg.in/inf.v0 v0.9.1 // indirect
157151
gopkg.in/yaml.v3 v3.0.1 // indirect
158-
k8s.io/apiserver v0.25.2 // indirect
159-
k8s.io/component-base v0.25.2 // indirect
160-
k8s.io/klog/v2 v2.70.1 // indirect
161-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
162-
k8s.io/kubectl v0.25.2 // indirect
163-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
164-
oras.land/oras-go v1.2.0 // indirect
152+
k8s.io/apiserver v0.26.2 // indirect
153+
k8s.io/component-base v0.26.2 // indirect
154+
k8s.io/klog/v2 v2.90.1 // indirect
155+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
156+
k8s.io/kubectl v0.26.0 // indirect
157+
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
158+
oras.land/oras-go v1.2.2 // indirect
165159
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
166160
sigs.k8s.io/kustomize/api v0.12.1 // indirect
167161
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

0 commit comments

Comments
 (0)