Skip to content

Commit

Permalink
Upgrade UBI to 8.9 and dependencies (#887)
Browse files Browse the repository at this point in the history
Signed-off-by: Bala.FA <[email protected]>
  • Loading branch information
balamurugana authored Dec 18, 2023
1 parent c580047 commit a70e7af
Show file tree
Hide file tree
Showing 11 changed files with 177 additions and 562 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/functests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
kube-version: ['v1.18.20', 'v1.19.16', 'v1.20.15', 'v1.21.14', 'v1.22.17', 'v1.23.17', 'v1.24.17', 'v1.25.14', 'v1.26.9', 'v1.27.6', 'v1.28.2']
kube-version: ['v1.18.20', 'v1.19.16', 'v1.20.15', 'v1.21.14', 'v1.22.17', 'v1.23.17', 'v1.24.17', 'v1.25.16', 'v1.26.11', 'v1.27.8', 'v1.28.4', 'v1.29.0']
os: [ubuntu-20.04, ubuntu-22.04]
exclude:
- os: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- uses: ludeeus/action-shellcheck@master
- uses: golangci/golangci-lint-action@v3
with:
version: v1.54.2
version: v1.55.2
args: --config ./.golangci.yml --timeout=60m
skip-go-installation: true
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ issues:
- exitAfterDefer

service:
golangci-lint-version: 1.54.2 # use the fixed version to not introduce new linters unexpectedly
golangci-lint-version: 1.55.2 # 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 @@ -13,7 +13,7 @@ release:

before:
hooks:
- go mod tidy -compat=1.20
- go mod tidy -compat=1.21
- go mod download

builds:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9

WORKDIR /

Expand Down
4 changes: 2 additions & 2 deletions cmd/kubectl-directpv/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const dot = "•"
func printYAML(obj interface{}) {
data, err := utils.ToYAML(obj)
if err != nil {
klog.Fatalf("unable to marshal object to YAML; %w", err)
klog.Fatalf("unable to marshal object to YAML; %v", err)
}

fmt.Print(string(data))
Expand All @@ -52,7 +52,7 @@ func printYAML(obj interface{}) {
func printJSON(obj interface{}) {
data, err := utils.ToJSON(obj)
if err != nil {
klog.Fatalf("unable to marshal object to JSON; %w", err)
klog.Fatalf("unable to marshal object to JSON; %v", err)
}

fmt.Print(string(data))
Expand Down
8 changes: 4 additions & 4 deletions codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ VERSIONS=(v1beta1)

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

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

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

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

Expand Down
96 changes: 50 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ module github.com/minio/directpv
go 1.21

require (
github.com/charmbracelet/bubbles v0.16.1
github.com/charmbracelet/bubbletea v0.24.2
github.com/charmbracelet/lipgloss v0.8.0
github.com/container-storage-interface/spec v1.8.0
github.com/charmbracelet/bubbles v0.17.1
github.com/charmbracelet/bubbletea v0.25.0
github.com/charmbracelet/lipgloss v0.9.1
github.com/container-storage-interface/spec v1.9.0
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/freddierice/go-losetup/v2 v2.0.1
github.com/google/uuid v1.3.1
github.com/jedib0t/go-pretty/v6 v6.4.7
github.com/kubernetes-csi/csi-lib-utils v0.15.0
github.com/google/uuid v1.5.0
github.com/jedib0t/go-pretty/v6 v6.4.9
github.com/kubernetes-csi/csi-lib-utils v0.16.0
github.com/minio/sha256-simd v1.0.1
github.com/mitchellh/go-homedir v1.1.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
golang.org/x/time v0.3.0
github.com/prometheus/client_model v0.5.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.1
golang.org/x/time v0.5.0
google.golang.org/grpc v1.60.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.28.2
k8s.io/apiextensions-apiserver v0.28.2
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230928205116-a78145627833
k8s.io/pod-security-admission v0.28.2
sigs.k8s.io/yaml v1.3.0
k8s.io/api v0.28.4
k8s.io/apiextensions-apiserver v0.28.4
k8s.io/apimachinery v0.28.4
k8s.io/client-go v0.28.4
k8s.io/klog/v2 v2.110.1
k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8
k8s.io/pod-security-admission v0.28.4
sigs.k8s.io/yaml v1.4.0
)

require (
Expand All @@ -38,34 +38,34 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.3 // indirect
github.com/go-openapi/swag v0.22.5 // 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.3 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.5.9 // 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/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // 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.18 // 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/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.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
Expand All @@ -74,30 +74,34 @@ require (
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.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.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/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.5.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
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/protobuf v1.31.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.28.2 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
k8s.io/component-base v0.28.4 // indirect
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit a70e7af

Please sign in to comment.