Skip to content

Commit

Permalink
[v2.8] Bump dependencies (#376)
Browse files Browse the repository at this point in the history
* Bump bci image to 15.6
* Bump rancher apis and client packages
* Bump client-go
* Bump rancher to v2.8 head
* Bump norman
* Bump k8s.io/kubernetes to v1.28.9
  • Loading branch information
pmatseykanets authored Jul 17, 2024
1 parent 0a57bbb commit c9b5a0c
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 765 deletions.
2 changes: 1 addition & 1 deletion cliclient/cliclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/rancher/cli/config"
"github.com/rancher/norman/clientbase"
ntypes "github.com/rancher/norman/types"
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1alpha4"
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3"
managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
projectClient "github.com/rancher/rancher/pkg/client/generated/project/v3"
Expand Down
2 changes: 1 addition & 1 deletion cmd/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/rancher/cli/cliclient"
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1alpha4"
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
"github.com/urfave/cli"
)

Expand Down
31 changes: 17 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,27 @@ module github.com/rancher/cli

go 1.21

replace k8s.io/client-go => k8s.io/client-go v0.28.8
replace (
k8s.io/client-go => k8s.io/client-go v0.28.9
k8s.io/kubernetes => k8s.io/kubernetes v1.28.9
)

require (
github.com/ghodss/yaml v1.0.0
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
github.com/hashicorp/go-version v1.2.1
github.com/pkg/errors v0.9.1
github.com/rancher/norman v0.0.0-20240410145219-820741f8efd3
github.com/rancher/rancher/pkg/apis v0.0.0-20240527134706-14d30b8bbcd5
github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473
github.com/rancher/norman v0.0.0-20240522191341-a0c752c7fa37
github.com/rancher/rancher/pkg/apis v0.0.0-20240717205341-1dceeccd0eb9
github.com/rancher/rancher/pkg/client v0.0.0-20240717205341-1dceeccd0eb9
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/tidwall/gjson v1.17.0
github.com/urfave/cli v1.22.5
golang.org/x/oauth2 v0.20.0
golang.org/x/oauth2 v0.21.0
golang.org/x/sync v0.7.0
golang.org/x/term v0.20.0
golang.org/x/text v0.15.0
golang.org/x/term v0.22.0
golang.org/x/text v0.16.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/yaml.v2 v2.4.0
k8s.io/client-go v12.0.0+incompatible
Expand Down Expand Up @@ -62,23 +65,23 @@ require (
github.com/rancher/fleet/pkg/apis v0.9.1-rc.2.0.20240213164401-2c6b1019687c // indirect
github.com/rancher/gke-operator v1.3.0-rc6 // indirect
github.com/rancher/lasso v0.0.0-20240325194215-0064abcb8aee // indirect
github.com/rancher/rke v1.5.9 // indirect
github.com/rancher/rke v1.5.11-rc5 // indirect
github.com/rancher/wrangler/v2 v2.2.0-rc3 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.28.8 // indirect
k8s.io/apimachinery v0.28.8 // indirect
k8s.io/apiserver v0.28.8 // indirect
k8s.io/component-base v0.28.8 // indirect
k8s.io/api v0.28.9 // indirect
k8s.io/apimachinery v0.28.9 // indirect
k8s.io/apiserver v0.28.9 // indirect
k8s.io/component-base v0.28.9 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kubernetes v1.28.8 // indirect
Expand Down
Loading

0 comments on commit c9b5a0c

Please sign in to comment.