Skip to content

Commit

Permalink
Update Go to 1.19 (#1384)
Browse files Browse the repository at this point in the history
  • Loading branch information
dvaldivia authored Jan 6, 2023
1 parent 6dacd62 commit 32c81a8
Show file tree
Hide file tree
Showing 12 changed files with 710 additions and 703 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
Expand All @@ -22,8 +22,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.18.x]
os: [ubuntu-latest]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -45,8 +45,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.18.x]
os: [ubuntu-latest]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/kubernetes-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v2
Expand All @@ -26,7 +26,7 @@ jobs:
- getdeps
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -43,7 +43,7 @@ jobs:
- getdeps
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -60,7 +60,7 @@ jobs:
- getdeps
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -77,7 +77,7 @@ jobs:
- getdeps
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -94,7 +94,7 @@ jobs:
- getdeps
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -112,7 +112,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.18.x, 1.19.x ]
go-version: [ 1.19.x, 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -136,7 +136,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -158,7 +158,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -180,7 +180,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -204,7 +204,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -228,7 +228,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
os: [ ubuntu-latest ]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ linters-settings:
locale: US

run:
go: '1.18'
go: '1.19'

linters:
disable-all: true
Expand All @@ -25,8 +25,8 @@ linters:
issues:
exclude-use-default: false
exclude:
- should have a package comment
- error strings should not be capitalized or end with punctuation or a newline
- should have a package comment
- error strings should not be capitalized or end with punctuation or a newline
exclude-rules:
# Exclude linters from running on auto-generated files.
- path: pkg/client
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ before:
hooks:
- make clean
- go generate ./...
- go mod tidy -compat=1.18
- go mod tidy -compat=1.19
- go mod download

builds:
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ clean:
@rm -rf dist/

regen-crd:
@go install github.com/minio/controller-tools/cmd/controller-gen@v0.4.7
@echo "WARNING: installing our fork github.com/minio/controller-tools/cmd/controller-gen@v0.4.7"
@echo "Any other controller-gen will cause the generated CRD to lose the volumeClaimTemplate metadata to be lost"
@go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1
@${GOPATH}/bin/controller-gen crd:maxDescLen=0,generateEmbeddedObjectMeta=true paths="./..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS)
@kustomize build resources/patch-crd > $(TMPFILE)
@mv -f $(TMPFILE) resources/base/crds/minio.min.io_tenants.yaml
Expand Down
82 changes: 42 additions & 40 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
module github.com/minio/operator

go 1.18
go 1.19

require (
github.com/blang/semver/v4 v4.0.0
github.com/docker/cli v20.10.20+incompatible
github.com/docker/cli v20.10.22+incompatible
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/go-containerregistry v0.11.0
github.com/google/go-containerregistry v0.12.1
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-version v1.6.0
github.com/miekg/dns v1.1.50
github.com/minio/madmin-go v1.6.6
github.com/minio/mc v0.0.0-20221019004256-8493f97e042f
github.com/minio/minio-go/v7 v7.0.41
github.com/minio/pkg v1.5.4
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.60.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.60.1
github.com/stretchr/testify v1.8.0
github.com/tidwall/gjson v1.14.3
golang.org/x/crypto v0.0.0-20221012134737-56aed061732a
golang.org/x/time v0.1.0
github.com/minio/madmin-go v1.7.5
github.com/minio/mc v0.0.0-20221224152138-176072dee43d
github.com/minio/minio-go/v7 v7.0.45
github.com/minio/pkg v1.5.8
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.61.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.61.1
github.com/stretchr/testify v1.8.1
github.com/tidwall/gjson v1.14.4
golang.org/x/crypto v0.5.0
golang.org/x/time v0.3.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.25.4
k8s.io/apiextensions-apiserver v0.25.3
k8s.io/apiextensions-apiserver v0.25.4
k8s.io/apimachinery v0.25.4
k8s.io/client-go v0.25.4
k8s.io/code-generator v0.25.3
k8s.io/code-generator v0.25.4
k8s.io/klog/v2 v2.80.1
k8s.io/kubectl v0.25.4
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/controller-runtime v0.13.1
)

require (
cloud.google.com/go/compute v1.7.0 // indirect
cloud.google.com/go/compute v1.10.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
Expand All @@ -47,16 +47,16 @@ require (
github.com/charmbracelet/lipgloss v0.6.0 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.12.1 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.17+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/docker v20.10.20+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
Expand All @@ -81,10 +81,12 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/klauspost/cpuid/v2 v2.1.2 // indirect
github.com/juju/ratelimit v1.0.2 // indirect
github.com/klauspost/compress v1.15.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.1 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
Expand All @@ -100,9 +102,10 @@ require (
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/minio/cli v1.24.0 // indirect
github.com/minio/cli v1.24.2 // indirect
github.com/minio/colorjson v1.0.4 // indirect
github.com/minio/filepath v1.0.0 // indirect
github.com/minio/madmin-go/v2 v2.0.1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/selfupdate v0.5.0 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
Expand All @@ -117,14 +120,14 @@ require (
github.com/navidys/tvxwidgets v0.1.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/xattr v0.4.9 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
Expand All @@ -140,25 +143,24 @@ require (
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tinylib/msgp v1.1.7-0.20211026165309-e818a1881b0e // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 // indirect
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.2.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.0.0-20221017184919-83659145692c // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/grpc v1.50.1 // indirect
Expand All @@ -167,9 +169,9 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
Loading

0 comments on commit 32c81a8

Please sign in to comment.