Skip to content

Commit 774a144

Browse files
vishesh92vishesh92
authored
Upgrade dependencies (apache#67)
1 parent 0dc33dd commit 774a144

File tree

8 files changed

+160
-135
lines changed

8 files changed

+160
-135
lines changed

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

+2-2
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.repository == 'apache/cloudstack-kubernetes-provider' && (github.event_name != 'pull_request' || 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

+4-3
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

+1-1
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

+1-1
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

+1-1
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

-3
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

+44-42
Original file line numberDiff line numberDiff line change
@@ -1,51 +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.24.17
10+
k8s.io/apimachinery v0.24.17
11+
k8s.io/cloud-provider v0.24.17
12+
k8s.io/component-base v0.24.17
1313
k8s.io/klog/v2 v2.80.1
1414
)
1515

1616
require (
1717
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
1818
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
2119
github.com/beorn7/perks v1.0.1 // indirect
2220
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
21+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2422
github.com/coreos/go-semver v0.3.0 // indirect
2523
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
2624
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
25+
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
2826
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
29-
github.com/felixge/httpsnoop v1.0.3 // indirect
27+
github.com/felixge/httpsnoop v1.0.4 // indirect
3028
github.com/fsnotify/fsnotify v1.6.0 // indirect
31-
github.com/go-logr/logr v1.2.3 // indirect
29+
github.com/go-logr/logr v1.4.1 // indirect
3230
github.com/go-openapi/jsonpointer v0.19.5 // indirect
33-
github.com/go-openapi/jsonreference v0.19.5 // indirect
31+
github.com/go-openapi/jsonreference v0.20.0 // indirect
3432
github.com/go-openapi/swag v0.19.14 // indirect
3533
github.com/gogo/protobuf v1.3.2 // indirect
3634
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3735
github.com/golang/mock v1.6.0 // indirect
38-
github.com/golang/protobuf v1.5.2 // indirect
36+
github.com/golang/protobuf v1.5.4 // indirect
3937
github.com/google/gnostic v0.5.7-v3refs // indirect
40-
github.com/google/go-cmp v0.5.9 // indirect
38+
github.com/google/go-cmp v0.6.0 // indirect
4139
github.com/google/gofuzz v1.1.0 // indirect
42-
github.com/google/uuid v1.1.2 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
4341
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
4442
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
4543
github.com/imdario/mergo v0.3.6 // indirect
4644
github.com/inconshreveable/mousetrap v1.0.1 // indirect
4745
github.com/josharian/intern v1.0.0 // indirect
4846
github.com/json-iterator/go v1.1.12 // indirect
47+
github.com/kr/pretty v0.3.1 // indirect
4948
github.com/mailru/easyjson v0.7.6 // indirect
5049
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
5150
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
@@ -58,9 +57,9 @@ require (
5857
github.com/prometheus/common v0.37.0 // indirect
5958
github.com/prometheus/procfs v0.8.0 // indirect
6059
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
60+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
61+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
62+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
6463
go.opentelemetry.io/contrib v0.20.0 // indirect
6564
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
6665
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -75,30 +74,33 @@ require (
7574
go.uber.org/atomic v1.7.0 // indirect
7675
go.uber.org/multierr v1.6.0 // indirect
7776
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
77+
golang.org/x/crypto v0.24.0 // indirect
78+
golang.org/x/net v0.25.0 // indirect
79+
golang.org/x/oauth2 v0.18.0 // indirect
80+
golang.org/x/sync v0.7.0 // indirect
81+
golang.org/x/sys v0.21.0 // indirect
82+
golang.org/x/term v0.21.0 // indirect
83+
golang.org/x/text v0.16.0 // indirect
84+
golang.org/x/time v0.3.0 // indirect
85+
google.golang.org/appengine v1.6.8 // indirect
86+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
87+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
88+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
89+
google.golang.org/grpc v1.64.0 // indirect
90+
google.golang.org/protobuf v1.34.1 // indirect
91+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
9092
gopkg.in/inf.v0 v0.9.1 // indirect
9193
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9294
gopkg.in/warnings.v0 v0.1.1 // indirect
9395
gopkg.in/yaml.v2 v2.4.0 // indirect
9496
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
97+
k8s.io/apiserver v0.24.17 // indirect
98+
k8s.io/client-go v0.24.17 // indirect
99+
k8s.io/component-helpers v0.24.17 // indirect
100+
k8s.io/controller-manager v0.24.17 // indirect
99101
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
100102
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
101-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
103+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
102104
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
103105
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
104106
sigs.k8s.io/yaml v1.3.0 // indirect
@@ -108,17 +110,17 @@ replace (
108110
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
109111
golang.org/x/sys => golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba
110112
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
113+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.17
112114
)
113115

114-
replace k8s.io/kubectl => k8s.io/kubectl v0.24.12
116+
replace k8s.io/kubectl => k8s.io/kubectl v0.24.17
115117

116-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.12
118+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.17
117119

118-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.12
120+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.17
119121

120-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.12
122+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.17
121123

122-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.12
124+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.17
123125

124-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.12
126+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.17

0 commit comments

Comments
 (0)