Skip to content

Commit

Permalink
Merge pull request #693 from mjura/k8s-v2.9
Browse files Browse the repository at this point in the history
[v2.9] Bump k8s to v0.30.1 and rancher/pkg/apis
  • Loading branch information
mjura authored Oct 31, 2024
2 parents e921a95 + 0c14c22 commit 730806e
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 54 deletions.
29 changes: 13 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ go 1.22.0

toolchain go1.22.7

// TODO: to be removed when rancher/pkg/apis is updated after k8s-1.30 PR is merged in rancher
replace k8s.io/apiserver => k8s.io/apiserver v0.29.7

replace (
k8s.io/apiserver => k8s.io/apiserver v0.30.1
k8s.io/client-go => k8s.io/client-go v0.30.1
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
)
Expand All @@ -20,19 +18,19 @@ require (
github.com/pkg/errors v0.9.1
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20231206161614-20a517410736
github.com/rancher/lasso v0.0.0-20240705194423-b2a060d103c1
github.com/rancher/rancher/pkg/apis v0.0.0-20240613110601-c21147a009c6
github.com/rancher/rancher/pkg/apis v0.0.0-20240719121207-baeda6b89fe3
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e
github.com/rancher/wrangler/v3 v3.0.0
github.com/sirupsen/logrus v1.9.3
golang.org/x/net v0.30.0
golang.org/x/oauth2 v0.23.0
google.golang.org/api v0.153.0
k8s.io/api v0.30.1
k8s.io/api v0.30.2
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/apimachinery v0.30.2
k8s.io/apiserver v0.30.1
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -44,7 +42,7 @@ require (
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/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
Expand Down Expand Up @@ -75,13 +73,12 @@ require (
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rancher/aks-operator v1.9.0-rc.4 // indirect
github.com/rancher/eks-operator v1.9.0-rc.5 // indirect
github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79 // indirect
github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b // indirect
github.com/rancher/rke v1.6.0-rc6 // indirect
github.com/rancher/aks-operator v1.9.0 // indirect
github.com/rancher/eks-operator v1.9.0 // indirect
github.com/rancher/fleet/pkg/apis v0.10.0 // indirect
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
github.com/rancher/rke v1.6.0-rc9 // indirect
github.com/rancher/wrangler v1.1.1 // indirect
github.com/rancher/wrangler/v2 v2.2.0-rc6 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand All @@ -106,8 +103,8 @@ require (
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubernetes v1.29.7 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/kubernetes v1.30.1 // indirect
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
sigs.k8s.io/cli-utils v0.35.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 730806e

Please sign in to comment.