Skip to content

Commit 8501be3

Browse files
cpanatocpanato
committed
Update CAPI / go / dependencies for release-1.6
Signed-off-by: cpanato <[email protected]>
1 parent be17146 commit 8501be3

File tree

10 files changed

+159
-166
lines changed

10 files changed

+159
-166
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v3
2020
with:
21-
version: "v1.55"
21+
version: v1.58

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.21.7@sha256:549dd88a1a53715f177b41ab5fee25f7a376a6bb5322ac7abe263480d9554021 as builder
16+
FROM golang:1.21.10@sha256:45f2cab1eebfb90d214ab8ce896cefc320e5c8768b4b34bb402652d90c670875 as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENVSUBST_VER := v1.4.2
7171
ENVSUBST_BIN := envsubst
7272
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7373

74-
GOLANGCI_LINT_VER := v1.55.2
74+
GOLANGCI_LINT_VER := v1.58.0
7575
GOLANGCI_LINT_BIN := golangci-lint
7676
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7777

@@ -87,7 +87,7 @@ RELEASE_NOTES_VER := v0.11.0
8787
RELEASE_NOTES_BIN := release-notes
8888
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
8989

90-
GINKGO_VER := v2.15.0
90+
GINKGO_VER := v2.17.3
9191
GINKGO_BIN := ginkgo
9292
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9393
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
@@ -140,7 +140,7 @@ endif
140140
# Build time versioning details.
141141
LDFLAGS := $(shell hack/version.sh)
142142

143-
GOLANG_VERSION := 1.21.6
143+
GOLANG_VERSION := 1.21.10
144144

145145
# CI
146146
CAPG_WORKER_CLUSTER_KUBECONFIG ?= "/tmp/kubeconfig"
@@ -464,7 +464,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KIND) $(KUBECTL)
464464
./hack/install-cert-manager.sh
465465

466466
# Deploy CAPI
467-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
467+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
468468

469469
# Deploy CAPG
470470
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings = {
1818
"deploy_cert_manager": True,
1919
"preload_images_for_kind": True,
2020
"kind_cluster_name": "capg",
21-
"capi_version": "v1.6.2",
21+
"capi_version": "v1.6.5",
2222
"cert_manager_version": "v1.11.0",
2323
"kubernetes_version": "v1.28.6",
2424
}

‎go.mod‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,44 @@ replace (
77
github.com/google/cel-go => github.com/google/cel-go v0.16.1
88
// kube-openapi should match the version imported by CAPI.
99
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
10-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.2
10+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.5
1111
)
1212

1313
require (
14-
cloud.google.com/go/compute v1.24.0
15-
cloud.google.com/go/container v1.31.0
16-
cloud.google.com/go/iam v1.1.6
17-
cloud.google.com/go/resourcemanager v1.9.5
18-
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0
14+
cloud.google.com/go/compute v1.26.0
15+
cloud.google.com/go/container v1.35.1
16+
cloud.google.com/go/iam v1.1.8
17+
cloud.google.com/go/resourcemanager v1.9.7
18+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.27.0
1919
github.com/go-logr/logr v1.4.1
2020
github.com/google/go-cmp v0.6.0
21-
github.com/googleapis/gax-go/v2 v2.12.2
22-
github.com/onsi/ginkgo/v2 v2.15.0
23-
github.com/onsi/gomega v1.31.1
21+
github.com/googleapis/gax-go/v2 v2.12.4
22+
github.com/onsi/ginkgo/v2 v2.17.3
23+
github.com/onsi/gomega v1.33.1
2424
github.com/pkg/errors v0.9.1
2525
github.com/spf13/pflag v1.0.5
26-
github.com/stretchr/testify v1.8.4
27-
golang.org/x/crypto v0.19.0
28-
golang.org/x/mod v0.15.0
29-
golang.org/x/net v0.21.0
30-
google.golang.org/api v0.167.0
31-
google.golang.org/grpc v1.62.0
32-
k8s.io/api v0.28.6
33-
k8s.io/apimachinery v0.28.6
34-
k8s.io/client-go v0.28.6
35-
k8s.io/component-base v0.28.6
26+
github.com/stretchr/testify v1.9.0
27+
golang.org/x/crypto v0.23.0
28+
golang.org/x/mod v0.17.0
29+
golang.org/x/net v0.25.0
30+
google.golang.org/api v0.180.0
31+
google.golang.org/grpc v1.63.2
32+
k8s.io/api v0.28.10
33+
k8s.io/apimachinery v0.28.10
34+
k8s.io/client-go v0.28.10
35+
k8s.io/component-base v0.28.10
3636
k8s.io/klog/v2 v2.110.1
3737
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
38-
sigs.k8s.io/cluster-api v1.6.2
39-
sigs.k8s.io/cluster-api/test v1.6.2
38+
sigs.k8s.io/cluster-api v1.6.5
39+
sigs.k8s.io/cluster-api/test v1.6.5
4040
sigs.k8s.io/controller-runtime v0.16.5
4141
)
4242

4343
require (
44-
cloud.google.com/go v0.112.0 // indirect
45-
cloud.google.com/go/longrunning v0.5.5 // indirect
44+
cloud.google.com/go v0.112.2 // indirect
45+
cloud.google.com/go/auth v0.4.1 // indirect
46+
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
47+
cloud.google.com/go/longrunning v0.5.6 // indirect
4648
github.com/NYTimes/gziphandler v1.1.1 // indirect
4749
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
4850
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
@@ -53,6 +55,7 @@ require (
5355
github.com/distribution/reference v0.5.0 // indirect
5456
github.com/felixge/httpsnoop v1.0.4 // indirect
5557
github.com/go-logr/stdr v1.2.2 // indirect
58+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5659
github.com/google/gnostic-models v0.6.8 // indirect
5760
github.com/google/go-github/v53 v53.2.0 // indirect
5861
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -64,24 +67,24 @@ require (
6467
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
6568
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
6669
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
67-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
68-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
69-
go.opentelemetry.io/otel v1.23.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
72+
go.opentelemetry.io/otel v1.24.0 // indirect
7073
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
7174
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
72-
go.opentelemetry.io/otel/metric v1.23.0 // indirect
73-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.23.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
76+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
7578
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
7679
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
77-
golang.org/x/sync v0.6.0 // indirect
80+
golang.org/x/sync v0.7.0 // indirect
7881
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
7982
k8s.io/kms v0.28.6 // indirect
8083
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
8184
)
8285

8386
require (
84-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
87+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
8588
github.com/BurntSushi/toml v1.0.0 // indirect
8689
github.com/MakeNowJust/heredoc v1.0.0 // indirect
8790
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -96,7 +99,7 @@ require (
9699
github.com/cespare/xxhash/v2 v2.2.0 // indirect
97100
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
98101
github.com/docker/distribution v2.8.3+incompatible // indirect
99-
github.com/docker/docker v24.0.7+incompatible // indirect
102+
github.com/docker/docker v24.0.9+incompatible // indirect
100103
github.com/docker/go-connections v0.4.0 // indirect
101104
github.com/docker/go-units v0.4.0 // indirect
102105
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -108,15 +111,14 @@ require (
108111
github.com/go-openapi/jsonpointer v0.19.6 // indirect
109112
github.com/go-openapi/jsonreference v0.20.2 // indirect
110113
github.com/go-openapi/swag v0.22.3 // indirect
111-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
112114
github.com/gobuffalo/flect v1.0.2 // indirect
113115
github.com/gogo/protobuf v1.3.2 // indirect
114116
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
115-
github.com/golang/protobuf v1.5.3 // indirect
117+
github.com/golang/protobuf v1.5.4 // indirect
116118
github.com/google/cel-go v0.17.7 // indirect
117119
github.com/google/go-querystring v1.1.0 // indirect
118120
github.com/google/gofuzz v1.2.0 // indirect
119-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
121+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
120122
github.com/google/s2a-go v0.1.7 // indirect
121123
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
122124
github.com/google/uuid v1.6.0 // indirect
@@ -156,18 +158,17 @@ require (
156158
go.opencensus.io v0.24.0 // indirect
157159
go.uber.org/multierr v1.11.0 // indirect
158160
go.uber.org/zap v1.26.0 // indirect; indirect// indirect
159-
golang.org/x/oauth2 v0.17.0 // indirect
160-
golang.org/x/sys v0.17.0 // indirect
161-
golang.org/x/term v0.17.0 // indirect
162-
golang.org/x/text v0.14.0 // indirect
161+
golang.org/x/oauth2 v0.20.0 // indirect
162+
golang.org/x/sys v0.20.0 // indirect
163+
golang.org/x/term v0.20.0 // indirect
164+
golang.org/x/text v0.15.0 // indirect
163165
golang.org/x/time v0.5.0 // indirect
164-
golang.org/x/tools v0.16.1 // indirect
166+
golang.org/x/tools v0.20.0 // indirect
165167
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
166-
google.golang.org/appengine v1.6.8 // indirect
167-
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
168-
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
169-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
170-
google.golang.org/protobuf v1.32.0 // indirect
168+
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
169+
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
171+
google.golang.org/protobuf v1.34.1 // indirect
171172
gopkg.in/inf.v0 v0.9.1 // indirect
172173
gopkg.in/ini.v1 v1.67.0 // indirect
173174
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)