Skip to content

Commit

Permalink
upgrade dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Bala.FA <[email protected]>
  • Loading branch information
balamurugana committed Oct 2, 2024
1 parent c657af7 commit 94b4549
Show file tree
Hide file tree
Showing 27 changed files with 298 additions and 796 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x
check-latest: true
- name: Set environment
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
kube-version: ['v1.20.15', 'v1.21.14', 'v1.22.17', 'v1.23.17', 'v1.24.17', 'v1.25.16', 'v1.26.15', 'v1.27.15', 'v1.28.11', 'v1.29.6', 'v1.30.2']
kube-version: ['v1.20.15', 'v1.21.14', 'v1.22.17', 'v1.23.17', 'v1.24.17', 'v1.25.16', 'v1.26.15', 'v1.27.16', 'v1.28.14', 'v1.29.9', 'v1.30.5', 'v1.31.1']
os: [ubuntu-20.04, ubuntu-22.04]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x
check-latest: true

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x
check-latest: true
- uses: ludeeus/action-shellcheck@master
- uses: golangci/golangci-lint-action@v6
with:
version: v1.59.1
version: v1.61.0
args: --config ./.golangci.yml --timeout=60m
2 changes: 1 addition & 1 deletion .github/workflows/vulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x
check-latest: true
- name: Install govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
Expand Down
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
linters-settings:
run:
go: "1.22"
go: "1.23"

misspell:
locale: US
Expand All @@ -26,8 +26,8 @@ linters:
issues:
exclude-use-default: false
exclude:
- should have a package comment
- exitAfterDefer
- should have a package comment
- exitAfterDefer

service:
golangci-lint-version: 1.59.1 # use the fixed version to not introduce new linters unexpectedly
golangci-lint-version: 1.61.0 # use the fixed version to not introduce new linters unexpectedly
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ release:

before:
hooks:
- go mod tidy -compat=1.22
- go mod tidy -compat=1.23
- go mod download

builds:
Expand Down
4 changes: 2 additions & 2 deletions cmd/kubectl-directpv/discover.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func showDevices(resultMap map[directpvtypes.NodeID][]types.Device) error {
}

if writer.Length() == 0 || !foundAvailableDrive {
eprintf(false, color.HiYellowString("No drives are available to initialize")+"\n")
eprintf(false, "%v\n", color.HiYellowString("No drives are available to initialize"))
return errDiscoveryFailed
}

Expand Down Expand Up @@ -218,7 +218,7 @@ func discoverMain(ctx context.Context) {
eprintf(true, "discovery failed; %v\n", err)
os.Exit(1)
case <-ctx.Done():
eprintf(true, ctx.Err().Error())
eprintf(true, "%v", ctx.Err().Error())
os.Exit(1)
}
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@ func eprintf(isErr bool, format string, args ...any) {
}

func logFunc(log admin.LogMessage) {
eprintf(log.Type == admin.ErrorLogType, log.FormattedMessage)
eprintf(log.Type == admin.ErrorLogType, "%v", log.FormattedMessage)
}
54 changes: 19 additions & 35 deletions codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,13 @@ export PATH="$PATH:$GOPATH/bin"
# Must keep versions sorted.
VERSIONS=(v1beta1)

function install_code_generator() {
if [ ! -x "$GOPATH/bin/deepcopy-gen" ]; then
go install -v k8s.io/code-generator/cmd/[email protected]
fi

if [ ! -x "$GOPATH/bin/openapi-gen" ]; then
go install -v k8s.io/code-generator/cmd/[email protected]
fi

if [ ! -x "$GOPATH/bin/client-gen" ]; then
go install -v k8s.io/code-generator/cmd/[email protected]
fi

if [ ! -x "$GOPATH/bin/conversion-gen" ]; then
go install -v k8s.io/code-generator/cmd/[email protected]
fi
}

function install_controller_tools() {
if [ ! -x "$GOPATH/bin/controller-gen" ]; then
go install -v sigs.k8s.io/controller-tools/cmd/[email protected]
fi
}

install_code_generator
install_controller_tools
echo "Installing code generators ..."
go install -v \
k8s.io/code-generator/cmd/[email protected] \
k8s.io/code-generator/cmd/[email protected] \
k8s.io/code-generator/cmd/[email protected]
go install -v k8s.io/kube-openapi/cmd/[email protected]
go install -v sigs.k8s.io/controller-tools/cmd/[email protected]

cd "$(dirname "$0")"

Expand Down Expand Up @@ -80,16 +61,18 @@ input_dirs=$(IFS=,; echo "${arr[*]}")
echo "Running deepcopy-gen ..."
deepcopy-gen \
--go-header-file boilerplate.go.txt \
--input-dirs "${input_dirs}" \
--output-package "${REPOSITORY}/pkg/"
--output-file deepcopy_generated.go \
"${input_dirs}"

echo "Running openapi-gen ..."
for version in "${VERSIONS[@]}"; do
repo="${REPOSITORY}/pkg/apis/directpv.min.io/${version}"
openapi-gen \
--go-header-file boilerplate.go.txt \
--input-dirs "${repo}" \
--output-package "${repo}"
--output-file openapi_generated.go \
--output-dir "pkg/apis/directpv.min.io/${version}" \
--output-pkg "${repo}" \
"${repo}"
done

echo "Running client-gen ..."
Expand All @@ -99,12 +82,13 @@ arr=("${VERSIONS[@]/#/directpv.min.io/}")
input_versions=$(IFS=,; echo "${arr[*]}")
client-gen \
--go-header-file boilerplate.go.txt \
--input-dirs "${input_dirs}" \
--output-package "${REPOSITORY}/pkg/" \
--fake-clientset \
--output-dir pkg \
--output-pkg "${REPOSITORY}/pkg" \
--clientset-name clientset \
--input "${input_versions}" \
--input-base "${REPOSITORY}/pkg/apis"
--input-base "${REPOSITORY}/pkg/apis" \
"${input_dirs}"

echo "Running controller-gen ..."
controller-gen crd:crdVersions=v1 paths=./... output:dir=pkg/admin/installer
Expand All @@ -113,5 +97,5 @@ rm -f pkg/admin/installer/direct.csi.min.io_directcsidrives.yaml pkg/admin/insta
echo "Running conversion-gen ..."
conversion-gen \
--go-header-file boilerplate.go.txt \
--input-dirs "${VERSIONS[-1]/#/$REPOSITORY/pkg/apis/directpv.min.io/}" \
--output-package "${REPOSITORY}/pkg/"
--output-file zz_generated.conversion.go \
"${VERSIONS[-1]/#/$REPOSITORY/pkg/apis/directpv.min.io/}"
73 changes: 36 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
module github.com/minio/directpv

go 1.22.0
go 1.23.0

toolchain go1.22.5
toolchain go1.23.2

require (
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbletea v0.26.6
github.com/charmbracelet/lipgloss v0.11.0
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.1.1
github.com/charmbracelet/lipgloss v0.13.0
github.com/container-storage-interface/spec v1.10.0
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.17.0
github.com/freddierice/go-losetup/v2 v2.0.1
github.com/google/uuid v1.6.0
github.com/jedib0t/go-pretty/v6 v6.5.9
github.com/kubernetes-csi/csi-lib-utils v0.18.1
github.com/kubernetes-csi/csi-lib-utils v0.19.0
github.com/minio/sha256-simd v1.0.1
github.com/mitchellh/go-homedir v1.1.0
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_golang v1.20.4
github.com/prometheus/client_model v0.6.1
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
golang.org/x/time v0.5.0
google.golang.org/grpc v1.65.0
golang.org/x/time v0.6.0
google.golang.org/grpc v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.30.3
k8s.io/apiextensions-apiserver v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f
k8s.io/pod-security-admission v0.30.3
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38
k8s.io/pod-security-admission v0.31.1
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -39,74 +39,73 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/charmbracelet/x/ansi v0.1.2 // indirect
github.com/charmbracelet/x/input v0.1.2 // indirect
github.com/charmbracelet/x/term v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.1.2 // indirect
github.com/charmbracelet/x/ansi v0.3.2 // indirect
github.com/charmbracelet/x/term v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/hashicorp/hcl v1.0.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/klauspost/compress v1.17.10 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-runewidth v0.0.16 // 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/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
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/component-base v0.30.3 // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit 94b4549

Please sign in to comment.