Skip to content

Commit 5fb440b

Browse files
vishesh92vishesh92
committed
Upgrade dependencies
1 parent 0dc33dd commit 5fb440b

File tree

8 files changed

+218
-218
lines changed

8 files changed

+218
-218
lines changed

‎.github/workflows/build-docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ concurrency:
3434

3535
jobs:
3636
build:
37-
if: github.repository == 'apache/cloudstack-kubernetes-provider'
37+
if: github.event_name != "pull_request" || (github.repository == 'apache/cloudstack-kubernetes-provider' && github.event.pull_request.head.repo.full_name == github.repository)
3838
runs-on: ubuntu-22.04
3939
steps:
4040
- name: Login to Docker Registry
41-
uses: docker/login-action@v2
41+
uses: docker/login-action@v3
4242
with:
4343
registry: ${{ secrets.DOCKER_REGISTRY }}
4444
username: ${{ secrets.DOCKERHUB_USER }}

‎.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ jobs:
2828
runs-on: ubuntu-22.04
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- name: Set up Go
34-
uses: actions/setup-go@v3
34+
uses: actions/setup-go@v5
3535
with:
36-
go-version: 1.19
36+
go-version-file: go.mod
37+
3738
- name: Run Script
3839
run: make test
3940

‎.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: actions/setup-go@v5
3535
with:
36-
go-version: '1.19'
36+
go-version-file: go.mod
3737
- name: golangci-lint
3838
uses: golangci/golangci-lint-action@v6

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
FROM golang:1.19 as builder
18+
FROM golang:1.21 as builder
1919
COPY . /go/src/github.com/apache/cloudstack-kubernetes-provider
2020
WORKDIR /go/src/github.com/apache/cloudstack-kubernetes-provider
2121
RUN make clean && CGO_ENABLED=0 GOOS=linux make

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Instead, it first obtains the name of the node from Kubernetes, then fetches inf
126126

127127
### Building
128128

129-
At least Go 1.13 is required to build cloudstack-ccm.
129+
At least Go 1.21 is required to build cloudstack-ccm.
130130

131131
To build the controller with correct versioning, some build flags need to be passed.
132132
A Makefile is provided that sets these build flags to automatically derived values.

‎cmd/cloudstack-ccm/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ package main
2121

2222
import (
2323
goflag "flag"
24-
"math/rand"
25-
"time"
2624

2725
"k8s.io/apimachinery/pkg/util/wait"
2826
cloudprovider "k8s.io/cloud-provider"
@@ -43,7 +41,6 @@ import (
4341
)
4442

4543
func main() {
46-
rand.Seed(time.Now().UnixNano())
4744

4845
ccmOptions, err := options.NewCloudControllerManagerOptions()
4946
if err != nil {

‎go.mod

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,50 @@
11
module github.com/apache/cloudstack-kubernetes-provider
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/apache/cloudstack-go/v2 v2.15.0
77
github.com/spf13/pflag v1.0.5
88
gopkg.in/gcfg.v1 v1.2.3
9-
k8s.io/api v0.24.12
10-
k8s.io/apimachinery v0.24.12
11-
k8s.io/cloud-provider v0.24.12
12-
k8s.io/component-base v0.24.12
9+
k8s.io/api v0.26.15
10+
k8s.io/apimachinery v0.26.15
11+
k8s.io/cloud-provider v0.26.15
12+
k8s.io/component-base v0.26.15
1313
k8s.io/klog/v2 v2.80.1
1414
)
1515

1616
require (
17+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
1718
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
1819
github.com/NYTimes/gziphandler v1.1.1 // indirect
19-
github.com/PuerkitoBio/purell v1.1.1 // indirect
20-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
20+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
23+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
24+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2425
github.com/coreos/go-semver v0.3.0 // indirect
2526
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
2627
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
28+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2829
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
29-
github.com/felixge/httpsnoop v1.0.3 // indirect
30+
github.com/felixge/httpsnoop v1.0.4 // indirect
3031
github.com/fsnotify/fsnotify v1.6.0 // indirect
31-
github.com/go-logr/logr v1.2.3 // indirect
32+
github.com/go-logr/logr v1.4.1 // indirect
33+
github.com/go-logr/stdr v1.2.2 // indirect
3234
github.com/go-openapi/jsonpointer v0.19.5 // indirect
33-
github.com/go-openapi/jsonreference v0.19.5 // indirect
35+
github.com/go-openapi/jsonreference v0.20.0 // indirect
3436
github.com/go-openapi/swag v0.19.14 // indirect
3537
github.com/gogo/protobuf v1.3.2 // indirect
3638
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3739
github.com/golang/mock v1.6.0 // indirect
38-
github.com/golang/protobuf v1.5.2 // indirect
40+
github.com/golang/protobuf v1.5.4 // indirect
41+
github.com/google/cel-go v0.12.7 // indirect
3942
github.com/google/gnostic v0.5.7-v3refs // indirect
40-
github.com/google/go-cmp v0.5.9 // indirect
43+
github.com/google/go-cmp v0.6.0 // indirect
4144
github.com/google/gofuzz v1.1.0 // indirect
42-
github.com/google/uuid v1.1.2 // indirect
45+
github.com/google/uuid v1.6.0 // indirect
4346
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
44-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
47+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
4548
github.com/imdario/mergo v0.3.6 // indirect
4649
github.com/inconshreveable/mousetrap v1.0.1 // indirect
4750
github.com/josharian/intern v1.0.0 // indirect
@@ -58,47 +61,48 @@ require (
5861
github.com/prometheus/common v0.37.0 // indirect
5962
github.com/prometheus/procfs v0.8.0 // indirect
6063
github.com/spf13/cobra v1.6.0 // indirect
61-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
62-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
63-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
64-
go.opentelemetry.io/contrib v0.20.0 // indirect
65-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
66-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
67-
go.opentelemetry.io/otel v0.20.0 // indirect
68-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
69-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
70-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
71-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
72-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
73-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
74-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
64+
github.com/stoewer/go-strcase v1.2.0 // indirect
65+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
66+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
67+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
68+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
69+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
70+
go.opentelemetry.io/otel v1.19.0 // indirect
71+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
74+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
75+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
76+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
7577
go.uber.org/atomic v1.7.0 // indirect
7678
go.uber.org/multierr v1.6.0 // indirect
7779
go.uber.org/zap v1.19.0 // indirect
78-
golang.org/x/crypto v0.1.0 // indirect
79-
golang.org/x/net v0.8.0 // indirect
80-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
81-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
82-
golang.org/x/sys v0.6.0 // indirect
83-
golang.org/x/term v0.6.0 // indirect
84-
golang.org/x/text v0.8.0 // indirect
85-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
86-
google.golang.org/appengine v1.6.7 // indirect
87-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
88-
google.golang.org/grpc v1.49.0 // indirect
89-
google.golang.org/protobuf v1.28.1 // indirect
80+
golang.org/x/crypto v0.24.0 // indirect
81+
golang.org/x/net v0.25.0 // indirect
82+
golang.org/x/oauth2 v0.18.0 // indirect
83+
golang.org/x/sync v0.7.0 // indirect
84+
golang.org/x/sys v0.21.0 // indirect
85+
golang.org/x/term v0.21.0 // indirect
86+
golang.org/x/text v0.16.0 // indirect
87+
golang.org/x/time v0.3.0 // indirect
88+
google.golang.org/appengine v1.6.8 // indirect
89+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
91+
google.golang.org/grpc v1.64.0 // indirect
92+
google.golang.org/protobuf v1.34.1 // indirect
9093
gopkg.in/inf.v0 v0.9.1 // indirect
9194
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9295
gopkg.in/warnings.v0 v0.1.1 // indirect
9396
gopkg.in/yaml.v2 v2.4.0 // indirect
9497
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/apiserver v0.24.12 // indirect
96-
k8s.io/client-go v0.24.12 // indirect
97-
k8s.io/component-helpers v0.24.12 // indirect
98-
k8s.io/controller-manager v0.24.12 // indirect
99-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
98+
k8s.io/apiserver v0.26.15 // indirect
99+
k8s.io/client-go v0.26.15 // indirect
100+
k8s.io/component-helpers v0.26.15 // indirect
101+
k8s.io/controller-manager v0.26.15 // indirect
102+
k8s.io/kms v0.26.15 // indirect
103+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
100104
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
101-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
102106
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
103107
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
104108
sigs.k8s.io/yaml v1.3.0 // indirect
@@ -108,17 +112,17 @@ replace (
108112
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
109113
golang.org/x/sys => golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba
110114
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
111-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.12
115+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.15
112116
)
113117

114-
replace k8s.io/kubectl => k8s.io/kubectl v0.24.12
118+
replace k8s.io/kubectl => k8s.io/kubectl v0.26.15
115119

116-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.12
120+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.15
117121

118-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.12
122+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.26.15
119123

120-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.12
124+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.15
121125

122-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.12
126+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.15
123127

124-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.12
128+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.15

0 commit comments

Comments
 (0)