Skip to content

Commit 3f26d72

Browse files
authored
Update dependcies and update go to 1.21 (getporter#2999)
* update deps and golang to 1.21 Signed-off-by: Troy Connor <troy0820@users.noreply.github.com> --------- Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
1 parent a6a5ca4 commit 3f26d72

8 files changed

+103
-68
lines changed

.github/workflows/integ-reuseable-workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
type: string
1111
default: ghcr.io
1212
env:
13-
GOVERSION: 1.20.7
13+
GOVERSION: 1.21.3
1414
PORTER_INTEG_FILE: ${{inputs.test_name}}.go
1515

1616
jobs:

.github/workflows/porter-integration-pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- 'docs/**'
88

99
env:
10-
GOVERSION: 1.20.7
10+
GOVERSION: 1.21.3
1111

1212
jobs:
1313
archive_integration_test:
@@ -117,7 +117,7 @@ jobs:
117117
run: go run mage.go build
118118
shell: bash
119119
- name: Integration Test
120-
env:
120+
env:
121121
PORTER_INTEG_FILE: uninstall_test.go
122-
run: go run mage.go -v TestIntegration
122+
run: go run mage.go -v TestIntegration
123123
shell: bash

.github/workflows/porter-integration-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
default: ghcr.io
99

1010
env:
11-
GOVERSION: 1.20.7
11+
GOVERSION: 1.21.3
1212

1313
jobs:
1414
archive_integration_test:
@@ -138,7 +138,7 @@ jobs:
138138
run: go run mage.go build
139139
shell: bash
140140
- name: Integration Test
141-
env:
141+
env:
142142
PORTER_INTEG_FILE: uninstall_test.go
143-
run: go run mage.go -v TestIntegration
143+
run: go run mage.go -v TestIntegration
144144
shell: bash

.github/workflows/porter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
paths-ignore:
1010
- 'docs/**'
1111
env:
12-
GOVERSION: 1.20.7
12+
GOVERSION: 1.21.3
1313

1414
jobs:
1515
Build:

go.mod

+19-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module get.porter.sh/porter
22

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

57
replace (
68
// See https://github.com/hashicorp/go-plugin/pull/127 and
@@ -11,10 +13,11 @@ replace (
1113

1214
// Fixes https://github.com/spf13/viper/issues/761
1315
github.com/spf13/viper => github.com/getporter/viper v1.7.1-porter.2.0.20210514172839-3ea827168363
16+
1417
)
1518

1619
require (
17-
get.porter.sh/magefiles v0.6.1
20+
get.porter.sh/magefiles v0.6.2
1821
github.com/Masterminds/semver/v3 v3.2.1
1922
github.com/PaesslerAG/jsonpath v0.1.1
2023
github.com/carolynvs/aferox v0.3.0
@@ -32,7 +35,7 @@ require (
3235
github.com/docker/docker v24.0.5-0.20230714235725-36e9e796c6fc+incompatible
3336
github.com/dustin/go-humanize v1.0.1
3437
github.com/ghodss/yaml v1.0.0
35-
github.com/google/go-cmp v0.5.9
38+
github.com/google/go-cmp v0.6.0
3639
github.com/google/go-containerregistry v0.19.0
3740
github.com/google/uuid v1.3.1
3841
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -71,13 +74,13 @@ require (
7174
go.opentelemetry.io/otel/sdk v1.19.0
7275
go.opentelemetry.io/otel/trace v1.19.0
7376
go.uber.org/zap v1.24.0
74-
golang.org/x/sync v0.3.0
77+
golang.org/x/sync v0.5.0
7578
google.golang.org/grpc v1.59.0
7679
google.golang.org/protobuf v1.31.0
7780
gopkg.in/AlecAivazis/survey.v1 v1.8.8
7881
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
7982
gopkg.in/yaml.v3 v3.0.1
80-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
83+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
8184
)
8285

8386
require (
@@ -120,12 +123,12 @@ require (
120123
github.com/docker/go-metrics v0.0.1 // indirect
121124
github.com/docker/go-units v0.5.0 // indirect
122125
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
123-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
126+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
124127
github.com/fatih/color v1.15.0 // indirect
125128
github.com/felixge/httpsnoop v1.0.3 // indirect
126129
github.com/fsnotify/fsnotify v1.6.0 // indirect
127130
github.com/fvbommel/sortorder v1.1.0 // indirect
128-
github.com/go-logr/logr v1.2.4 // indirect
131+
github.com/go-logr/logr v1.3.0 // indirect
129132
github.com/go-logr/stdr v1.2.2 // indirect
130133
github.com/go-openapi/jsonpointer v0.19.6 // indirect
131134
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -227,14 +230,14 @@ require (
227230
go.uber.org/atomic v1.11.0 // indirect
228231
go.uber.org/multierr v1.11.0 // indirect
229232
golang.org/x/crypto v0.17.0 // indirect
230-
golang.org/x/mod v0.12.0 // indirect
231-
golang.org/x/net v0.17.0 // indirect
233+
golang.org/x/mod v0.14.0 // indirect
234+
golang.org/x/net v0.19.0 // indirect
232235
golang.org/x/oauth2 v0.12.0 // indirect
233236
golang.org/x/sys v0.15.0 // indirect
234237
golang.org/x/term v0.15.0 // indirect
235238
golang.org/x/text v0.14.0 // indirect
236239
golang.org/x/time v0.3.0 // indirect
237-
golang.org/x/tools v0.11.1 // indirect
240+
golang.org/x/tools v0.16.1 // indirect
238241
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
239242
google.golang.org/appengine v1.6.7 // indirect
240243
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
@@ -243,13 +246,13 @@ require (
243246
gopkg.in/inf.v0 v0.9.1 // indirect
244247
gopkg.in/ini.v1 v1.67.0 // indirect
245248
gopkg.in/yaml.v2 v2.4.0 // indirect
246-
k8s.io/api v0.28.0-alpha.3 // indirect
247-
k8s.io/apimachinery v0.28.0-alpha.3 // indirect
248-
k8s.io/client-go v0.28.0-alpha.3 // indirect
249-
k8s.io/klog/v2 v2.100.1 // indirect
250-
k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833 // indirect
249+
k8s.io/api v0.29.1 // indirect
250+
k8s.io/apimachinery v0.29.1 // indirect
251+
k8s.io/client-go v0.29.1 // indirect
252+
k8s.io/klog/v2 v2.110.1 // indirect
253+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
251254
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
252-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
255+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
253256
sigs.k8s.io/yaml v1.3.0 // indirect
254257
)
255258

0 commit comments

Comments
 (0)