Skip to content

Commit

Permalink
[release-1.26] update k8s.io/kubernetes to v1.26.11 in go.mod (#2498)
Browse files Browse the repository at this point in the history
* [occm] update k8s.io/kubernetes to v1.26.11 in go.mod

* Fix "go list -m all" execution

* remove rand seed

---------

Co-authored-by: Jesse Haka <[email protected]>
  • Loading branch information
kayrus and zetaab authored Dec 13, 2023
1 parent c04bc58 commit d014e5b
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 62 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
## BUILD ARGS ##
################################################################################
# This build arg allows the specification of a custom Golang image.
ARG GOLANG_IMAGE=golang:1.20.3
ARG GOLANG_IMAGE=golang:1.20.12

# The distroless image on which the CPI manager image is built.
#
# Please do not use "latest". Explicit tags should be used to provide
# deterministic builds. Follow what kubernetes uses to build
# kube-controller-manager, for example for 1.27.x:
# https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.3-bullseye.0
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.12-bullseye.0

# We use Alpine as the source for default CA certificates and some output
# images
Expand Down
4 changes: 0 additions & 4 deletions cmd/openstack-cloud-controller-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ package main
import (
goflag "flag"
"fmt"
"math/rand"
"os"
"time"

"github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/util/wait"
Expand All @@ -44,8 +42,6 @@ import (
)

func main() {
rand.Seed(time.Now().UnixNano())

ccmOptions, err := options.NewCloudControllerManagerOptions()
if err != nil {
klog.Fatalf("unable to initialize command options: %v", err)
Expand Down
51 changes: 34 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,40 @@ require (
golang.org/x/net v0.17.0
golang.org/x/sys v0.13.0
golang.org/x/term v0.13.0
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.31.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/godo.v2 v2.0.9
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.26.9
k8s.io/apimachinery v0.26.9
k8s.io/apiserver v0.26.9
k8s.io/client-go v0.26.9
k8s.io/cloud-provider v0.26.9
k8s.io/component-base v0.26.9
k8s.io/api v0.26.11
k8s.io/apimachinery v0.26.11
k8s.io/apiserver v0.26.11
k8s.io/client-go v0.26.11
k8s.io/cloud-provider v0.26.11
k8s.io/component-base v0.26.11
k8s.io/klog/v2 v2.80.1
k8s.io/kms v0.26.9
k8s.io/kubernetes v1.26.9
k8s.io/mount-utils v0.26.9
k8s.io/kms v0.26.11
k8s.io/kubernetes v1.26.11
k8s.io/mount-utils v0.26.11
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
software.sslmate.com/src/go-pkcs12 v0.2.0
)

// the below fixes the "go list -m all" execution
replace (
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.11
k8s.io/cri-api => k8s.io/cri-api v0.26.11
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.11
k8s.io/endpointslice => k8s.io/endpointslice v0.26.11
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.11
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.11
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.11
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.11
k8s.io/kubelet => k8s.io/kubelet v0.26.11
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.11
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.11
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
Expand All @@ -67,7 +82,7 @@ require (
github.com/go-openapi/swag v0.22.3 // 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.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.13.0 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
Expand Down Expand Up @@ -124,20 +139,22 @@ require (
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.5 // indirect
k8s.io/component-helpers v0.26.9 // indirect
k8s.io/controller-manager v0.26.9 // indirect
k8s.io/component-helpers v0.26.11 // indirect
k8s.io/controller-manager v0.26.11 // indirect
k8s.io/csi-translation-lib v0.26.5 // indirect
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
k8s.io/kubectl v0.26.5 // indirect
Expand Down
Loading

0 comments on commit d014e5b

Please sign in to comment.