Update dependcies and update go to 1.21 (#2999)

* update deps and golang to 1.21 Signed-off-by: Troy Connor <[email protected]> --------- Signed-off-by: Troy Connor <[email protected]>
getporter · Mar 13, 2024 · 3f26d72 · 3f26d72
1 parent a6a5ca4
commit 3f26d72
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 68 deletions.
diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml
@@ -10,7 +10,7 @@ on:
             type: string
             default: ghcr.io
 env:
-    GOVERSION: 1.20.7
+    GOVERSION: 1.21.3
     PORTER_INTEG_FILE: ${{inputs.test_name}}.go
 
 jobs:

diff --git a/.github/workflows/porter-integration-pr.yml b/.github/workflows/porter-integration-pr.yml
@@ -7,7 +7,7 @@ on:
     - 'docs/**'
 
 env:
-    GOVERSION: 1.20.7
+    GOVERSION: 1.21.3
 
 jobs:
   archive_integration_test:
@@ -117,7 +117,7 @@ jobs:
       run: go run mage.go build
       shell: bash
     - name: Integration Test
-      env: 
+      env:
         PORTER_INTEG_FILE: uninstall_test.go
-      run: go run mage.go -v TestIntegration 
+      run: go run mage.go -v TestIntegration
       shell: bash
diff --git a/.github/workflows/porter-integration-release.yml b/.github/workflows/porter-integration-release.yml
@@ -8,7 +8,7 @@ on:
         default: ghcr.io
 
 env:
-  GOVERSION: 1.20.7
+  GOVERSION: 1.21.3
 
 jobs:
   archive_integration_test:
@@ -138,7 +138,7 @@ jobs:
       run: go run mage.go build
       shell: bash
     - name: Integration Test
-      env: 
+      env:
         PORTER_INTEG_FILE: uninstall_test.go
-      run: go run mage.go -v TestIntegration 
+      run: go run mage.go -v TestIntegration
       shell: bash
diff --git a/.github/workflows/porter.yml b/.github/workflows/porter.yml
@@ -9,7 +9,7 @@ on:
     paths-ignore:
       - 'docs/**'
 env:
-  GOVERSION: 1.20.7
+  GOVERSION: 1.21.3
 
 jobs:
   Build:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module get.porter.sh/porter
 
-go 1.20
+go 1.21
+
+toolchain go1.21.3
 
 replace (
 	// See https://github.com/hashicorp/go-plugin/pull/127 and
@@ -11,10 +13,11 @@ replace (
 
 	// Fixes https://github.com/spf13/viper/issues/761
 	github.com/spf13/viper => github.com/getporter/viper v1.7.1-porter.2.0.20210514172839-3ea827168363
+
 )
 
 require (
-	get.porter.sh/magefiles v0.6.1
+	get.porter.sh/magefiles v0.6.2
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/PaesslerAG/jsonpath v0.1.1
 	github.com/carolynvs/aferox v0.3.0
@@ -32,7 +35,7 @@ require (
 	github.com/docker/docker v24.0.5-0.20230714235725-36e9e796c6fc+incompatible
 	github.com/dustin/go-humanize v1.0.1
 	github.com/ghodss/yaml v1.0.0
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.6.0
 	github.com/google/go-containerregistry v0.19.0
 	github.com/google/uuid v1.3.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -71,13 +74,13 @@ require (
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	go.uber.org/zap v1.24.0
-	golang.org/x/sync v0.3.0
+	golang.org/x/sync v0.5.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
 require (
@@ -120,12 +123,12 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -227,14 +230,14 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.11.1 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
@@ -243,13 +246,13 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.28.0-alpha.3 // indirect
-	k8s.io/apimachinery v0.28.0-alpha.3 // indirect
-	k8s.io/client-go v0.28.0-alpha.3 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833 // indirect
+	k8s.io/api v0.29.1 // indirect
+	k8s.io/apimachinery v0.29.1 // indirect
+	k8s.io/client-go v0.29.1 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )