Skip to content

Commit

Permalink
feat(helm): upgrade k8s libs to 1.26.13
Browse files Browse the repository at this point in the history
  • Loading branch information
paullaffitte committed Jan 25, 2024
1 parent 1b05dba commit a127b12
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 112 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION ?= 1.25
ENVTEST_K8S_VERSION ?= 1.26

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down
88 changes: 40 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,19 @@ require (
go.uber.org/automaxprocs v1.5.3
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
k8s.io/api v0.25.16
k8s.io/apimachinery v0.25.16
k8s.io/client-go v0.25.16
k8s.io/api v0.26.13
k8s.io/apimachinery v0.26.13
k8s.io/client-go v0.26.13
k8s.io/klog/v2 v2.110.1
k8s.io/kubernetes v1.25.16
k8s.io/kubernetes v1.26.13
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.13.2
sigs.k8s.io/controller-runtime v0.14.1
)

require github.com/blang/semver/v4 v4.0.0 // indirect

require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
Expand Down Expand Up @@ -74,7 +68,6 @@ require (
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
Expand Down Expand Up @@ -103,7 +96,6 @@ 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/rogpeppe/go-internal v1.11.0 // indirect
github.com/sirupsen/logrus v1.9.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
Expand All @@ -128,44 +120,44 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.25.16 // indirect
k8s.io/apiserver v0.25.16 // indirect
k8s.io/component-base v0.25.16 // indirect
k8s.io/apiextensions-apiserver v0.26.16 // indirect; indirec3
k8s.io/apiserver v0.26.16 // indirect; indirec3
k8s.io/component-base v0.26.16 // indirect; indirec3
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.25.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
k8s.io/apimachinery => k8s.io/apimachinery v0.25.16
k8s.io/apiserver => k8s.io/apiserver v0.25.16
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.16
k8s.io/client-go => k8s.io/client-go v0.25.16
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16
k8s.io/code-generator => k8s.io/code-generator v0.25.16
k8s.io/component-base => k8s.io/component-base v0.25.16
k8s.io/component-helpers => k8s.io/component-helpers v0.25.16
k8s.io/controller-manager => k8s.io/controller-manager v0.25.16
k8s.io/cri-api => k8s.io/cri-api v0.25.16
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.25.16
k8s.io/endpointslice => k8s.io/endpointslice v0.25.16
k8s.io/kms => k8s.io/kms v0.25.16
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
k8s.io/kubectl => k8s.io/kubectl v0.25.16
k8s.io/kubelet => k8s.io/kubelet v0.25.16
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.16
k8s.io/metrics => k8s.io/metrics v0.25.16
k8s.io/mount-utils => k8s.io/mount-utils v0.25.16
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.16
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.16
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.16
k8s.io/sample-controller => k8s.io/sample-controller v0.25.16
k8s.io/api => k8s.io/api v0.26.13
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.13
k8s.io/apimachinery => k8s.io/apimachinery v0.26.13
k8s.io/apiserver => k8s.io/apiserver v0.26.13
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.13
k8s.io/client-go => k8s.io/client-go v0.26.13
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.13
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.13
k8s.io/code-generator => k8s.io/code-generator v0.26.13
k8s.io/component-base => k8s.io/component-base v0.26.13
k8s.io/component-helpers => k8s.io/component-helpers v0.26.13
k8s.io/controller-manager => k8s.io/controller-manager v0.26.13
k8s.io/cri-api => k8s.io/cri-api v0.26.13
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.13
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.13
k8s.io/endpointslice => k8s.io/endpointslice v0.26.13
k8s.io/kms => k8s.io/kms v0.26.13
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.13
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.13
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.13
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.13
k8s.io/kubectl => k8s.io/kubectl v0.26.13
k8s.io/kubelet => k8s.io/kubelet v0.26.13
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.13
k8s.io/metrics => k8s.io/metrics v0.26.13
k8s.io/mount-utils => k8s.io/mount-utils v0.26.13
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.13
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.13
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.13
k8s.io/sample-controller => k8s.io/sample-controller v0.26.13
)
Loading

0 comments on commit a127b12

Please sign in to comment.