Skip to content

Commit

Permalink
Upgrade Go version and dependencies
Browse files Browse the repository at this point in the history
- Updated Go version from 1.21 to 1.22 in all GitHub workflows (`lint.yaml`, `publish-images.yaml`, `test-and-build.yaml`).
- Modified `go.mod` to use Go 1.22.0 and updated various dependencies to their latest versions:
  - `github.com/openshift/api` to `v0.0.0-20240701145226-44d00ee80f5e`
  - `github.com/rook/rook/pkg/apis` to `v0.0.0-20240701212738-8e25300ad55a`
  - `k8s.io/api` to `v0.30.2`
  - `k8s.io/apimachinery` to `v0.30.2`
  - `k8s.io/client-go` to `v0.29.5`
  - Updated other indirect dependencies in `go.sum`.

Signed-off-by: vbadrina <[email protected]>
  • Loading branch information
vbnrh committed Jul 17, 2024
1 parent 0e61c75 commit 30a37f8
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -73,7 +73,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -92,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -111,7 +111,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.21' ]
go: [ '1.22' ]
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.21 as builder
FROM golang:1.22 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
33 changes: 17 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
module github.com/red-hat-storage/odf-multicluster-orchestrator

go 1.21
go 1.22.0

require (
github.com/csi-addons/kubernetes-csi-addons v0.8.0
github.com/go-logr/zapr v1.3.0
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.32.0
github.com/openshift/api v0.0.0-20240323003854-2252c7adfb79
github.com/openshift/api v0.0.0-20240701145226-44d00ee80f5e
github.com/openshift/library-go v0.0.0-20240124134907-4dfbf6bc7b11
github.com/ramendr/ramen/api v0.0.0-20240409201920-10024cae3bfd
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20240327160100-bbe9d9d49462
github.com/rook/rook/pkg/apis v0.0.0-20240513003450-39f88521f0fd
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20240717095253-b12449490cc8
github.com/rook/rook/pkg/apis v0.0.0-20240701212738-8e25300ad55a
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
go.uber.org/zap/exp v0.2.0
golang.org/x/sync v0.6.0
k8s.io/api v0.29.3
golang.org/x/sync v0.7.0
k8s.io/api v0.30.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.3
k8s.io/client-go v0.29.3
k8s.io/apimachinery v0.30.2
k8s.io/client-go v0.29.5
k8s.io/klog/v2 v2.120.1
open-cluster-management.io/addon-framework v0.6.1
open-cluster-management.io/api v0.13.0
Expand Down Expand Up @@ -63,23 +63,23 @@ require (
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/vault/api v1.13.0 // indirect
github.com/hashicorp/vault/api v1.14.0 // indirect
github.com/hashicorp/vault/api/auth/approle v0.6.0 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.0 // indirect
github.com/libopenstorage/secrets v0.0.0-20231011182615-5f4b25ceede1 // indirect
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/noobaa/noobaa-operator/v5 v5.0.0-20240418141646-fcc5240f5af6 // indirect
github.com/noobaa/noobaa-operator/v5 v5.0.0-20240625102417-4d63b956e6e6 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo/v2 v2.17.1 // indirect
github.com/openshift/custom-resource-status v1.1.2 // indirect
Expand All @@ -94,13 +94,13 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/stolostron/multicloud-operators-placementrule v1.2.4-1-20220311-8eedb3f.0.20230828200208-cd3c119a7fa0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand Down Expand Up @@ -130,6 +130,7 @@ replace (
github.com/metal3-io/baremetal-operator/pkg/hardwareutils => github.com/openshift/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d
github.com/noobaa/noobaa-operator/v5 => github.com/noobaa/noobaa-operator/v5 v5.0.0-20220412093540-8972af85cac4
github.com/open-cluster-management-io/api => open-cluster-management.io/api v0.12.0
github.com/openshift/api => github.com/openshift/api v0.0.0-20240323003854-2252c7adfb79
github.com/openshift/hive => github.com/openshift/hive v1.1.17-0.20220223000051-b1c8fa5853b1
github.com/openshift/hive/apis => github.com/openshift/hive/apis v0.0.0-20220221165319-b389a65758da
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
Expand Down
Loading

0 comments on commit 30a37f8

Please sign in to comment.