Skip to content

Commit 152453c

Browse files
authoredJan 4, 2024
Merge pull request #194 from yulin-li/yulin/k8s-0.29
upgrade to k8s v0.29.x
2 parents 954d470 + 299f807 commit 152453c

File tree

4 files changed

+168
-104
lines changed

4 files changed

+168
-104
lines changed
 

‎.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99

10-
- name: Set up Go 1.20
10+
- name: Set up Go 1.21
1111
uses: actions/setup-go@v4
1212
with:
13-
go-version: "1.20"
13+
go-version: "1.21"
1414

1515
- uses: actions/checkout@v3
1616

@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
strategy:
3232
matrix:
33-
go: [ '1.20' ]
33+
go: [ '1.21' ]
3434

3535
steps:
3636
- uses: actions/checkout@v3

‎client_getter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (c *RESTClientGetter) ToRESTMapper() (meta.RESTMapper, error) {
5858
}
5959

6060
mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
61-
expander := restmapper.NewShortcutExpander(mapper, discoveryClient)
61+
expander := restmapper.NewShortcutExpander(mapper, discoveryClient, nil)
6262
return expander, nil
6363
}
6464

‎go.mod

+39-33
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
module github.com/mittwald/go-helm-client
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.5
46

57
require (
68
github.com/golang/mock v1.6.0
79
github.com/pkg/errors v0.9.1
810
github.com/spf13/pflag v1.0.5
911
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
10-
helm.sh/helm/v3 v3.13.2
11-
k8s.io/apiextensions-apiserver v0.28.2
12-
k8s.io/apimachinery v0.28.2
13-
k8s.io/cli-runtime v0.28.2
14-
k8s.io/client-go v0.28.2
15-
sigs.k8s.io/yaml v1.3.0
12+
helm.sh/helm/v3 v3.13.3
13+
k8s.io/apiextensions-apiserver v0.29.0
14+
k8s.io/apimachinery v0.29.0
15+
k8s.io/cli-runtime v0.29.0
16+
k8s.io/client-go v0.29.0
17+
sigs.k8s.io/yaml v1.4.0
1618
)
1719

1820
require (
@@ -25,7 +27,7 @@ require (
2527
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
2628
github.com/Masterminds/squirrel v1.5.4 // indirect
2729
github.com/Microsoft/hcsshim v0.11.0 // indirect
28-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
30+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2931
github.com/beorn7/perks v1.0.1 // indirect
3032
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3133
github.com/chai2010/gettext-go v1.0.2 // indirect
@@ -39,13 +41,13 @@ require (
3941
github.com/docker/go-connections v0.4.0 // indirect
4042
github.com/docker/go-metrics v0.0.1 // indirect
4143
github.com/docker/go-units v0.5.0 // indirect
42-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
44+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4345
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4446
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4547
github.com/fatih/color v1.13.0 // indirect
4648
github.com/go-errors/errors v1.4.2 // indirect
4749
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
48-
github.com/go-logr/logr v1.2.4 // indirect
50+
github.com/go-logr/logr v1.3.0 // indirect
4951
github.com/go-logr/stdr v1.2.2 // indirect
5052
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5153
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -55,11 +57,12 @@ require (
5557
github.com/golang/protobuf v1.5.3 // indirect
5658
github.com/google/btree v1.1.2 // indirect
5759
github.com/google/gnostic-models v0.6.8 // indirect
58-
github.com/google/go-cmp v0.5.9 // indirect
60+
github.com/google/go-cmp v0.6.0 // indirect
5961
github.com/google/gofuzz v1.2.0 // indirect
6062
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6163
github.com/google/uuid v1.3.0 // indirect
6264
github.com/gorilla/mux v1.8.0 // indirect
65+
github.com/gorilla/websocket v1.5.0 // indirect
6366
github.com/gosuri/uitable v0.0.4 // indirect
6467
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
6568
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -91,6 +94,7 @@ require (
9194
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9295
github.com/morikuni/aec v1.0.0 // indirect
9396
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9498
github.com/opencontainers/go-digest v1.0.0 // indirect
9599
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
96100
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -104,39 +108,41 @@ require (
104108
github.com/shopspring/decimal v1.3.1 // indirect
105109
github.com/sirupsen/logrus v1.9.3 // indirect
106110
github.com/spf13/cast v1.5.0 // indirect
107-
github.com/spf13/cobra v1.7.0 // indirect
111+
github.com/spf13/cobra v1.8.0 // indirect
108112
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
109113
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
110114
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
111115
github.com/xlab/treeprint v1.2.0 // indirect
112-
go.opentelemetry.io/otel v1.14.0 // indirect
113-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
116+
go.opentelemetry.io/otel v1.19.0 // indirect
117+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
118+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
114119
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
115-
golang.org/x/crypto v0.14.0 // indirect
116-
golang.org/x/net v0.17.0 // indirect
117-
golang.org/x/oauth2 v0.8.0 // indirect
120+
golang.org/x/crypto v0.16.0 // indirect
121+
golang.org/x/net v0.19.0 // indirect
122+
golang.org/x/oauth2 v0.10.0 // indirect
118123
golang.org/x/sync v0.3.0 // indirect
119-
golang.org/x/sys v0.14.0 // indirect
120-
golang.org/x/term v0.13.0 // indirect
121-
golang.org/x/text v0.13.0 // indirect
124+
golang.org/x/sys v0.15.0 // indirect
125+
golang.org/x/term v0.15.0 // indirect
126+
golang.org/x/text v0.14.0 // indirect
122127
golang.org/x/time v0.3.0 // indirect
123128
google.golang.org/appengine v1.6.7 // indirect
124-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
125-
google.golang.org/grpc v1.56.3 // indirect
126-
google.golang.org/protobuf v1.30.0 // indirect
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
130+
google.golang.org/grpc v1.58.3 // indirect
131+
google.golang.org/protobuf v1.31.0 // indirect
132+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
127133
gopkg.in/inf.v0 v0.9.1 // indirect
128134
gopkg.in/yaml.v2 v2.4.0 // indirect
129135
gopkg.in/yaml.v3 v3.0.1 // indirect
130-
k8s.io/api v0.28.2 // indirect
131-
k8s.io/apiserver v0.28.2 // indirect
132-
k8s.io/component-base v0.28.2 // indirect
133-
k8s.io/klog/v2 v2.100.1 // indirect
134-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
135-
k8s.io/kubectl v0.28.2 // indirect
136-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
136+
k8s.io/api v0.29.0 // indirect
137+
k8s.io/apiserver v0.29.0 // indirect
138+
k8s.io/component-base v0.29.0 // indirect
139+
k8s.io/klog/v2 v2.110.1 // indirect
140+
k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8 // indirect
141+
k8s.io/kubectl v0.29.0 // indirect
142+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
137143
oras.land/oras-go v1.2.4 // indirect
138144
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
140-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
141-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
145+
sigs.k8s.io/kustomize/api v0.16.0 // indirect
146+
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
147+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
142148
)

‎go.sum

+125-67
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.