Skip to content

Commit 9f3b1d0

Browse files
zhanggbjzhanggbj
authored
Bump CAPI&CAPV&Controller Runtime in E2E (#1526)
- bump CAPI to v1.11.0-alpha.2 - bump CAPV to v1.14.0-alpha.2 - bump k8s group to 33.2 - bump controll runtime to v0.21.0
1 parent 0a98849 commit 9f3b1d0

File tree

5 files changed

+178
-198
lines changed

5 files changed

+178
-198
lines changed

‎test/e2e/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ E2E_CHART ?= ${REPO_ROOT}/charts/vsphere-cpi
4141
E2E_DATA_DIR := ${REPO_ROOT}/test/e2e/data
4242

4343
# E2E_DATA_CAPV_TAG defines the providers from which tag of CAPV to use
44-
E2E_DATA_CAPV_TAG ?= v1.13.0
44+
E2E_DATA_CAPV_TAG ?= v1.14.0-alpha.2
4545

4646
# VERSION_DEV is the version of the image used for development
4747
VERSION_DEV ?= $(VERSION)

‎test/e2e/config/vsphere-ci.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,51 @@ providers:
1010
- name: cluster-api
1111
type: CoreProvider
1212
versions:
13-
- name: v1.10.1
13+
- name: v1.11.99
1414
# Use manifest from source files
15-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/core-components.yaml"
15+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-alpha.2/core-components.yaml"
1616
type: "url"
17-
contract: v1beta1
17+
contract: v1beta2
1818
files:
19-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
19+
- sourcePath: "../data/shared/capi/v1.11/metadata.yaml"
2020
replacements:
2121
- old: "imagePullPolicy: Always"
2222
new: "imagePullPolicy: IfNotPresent"
2323

2424
- name: kubeadm
2525
type: BootstrapProvider
2626
versions:
27-
- name: v1.10.1
27+
- name: v1.11.99
2828
# Use manifest from source files
29-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/bootstrap-components.yaml"
29+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-alpha.2/bootstrap-components.yaml"
3030
type: "url"
31-
contract: v1beta1
31+
contract: v1beta2
3232
files:
33-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
33+
- sourcePath: "../data/shared/capi/v1.11/metadata.yaml"
3434
replacements:
3535
- old: "imagePullPolicy: Always"
3636
new: "imagePullPolicy: IfNotPresent"
3737

3838
- name: kubeadm
3939
type: ControlPlaneProvider
4040
versions:
41-
- name: v1.10.1
41+
- name: v1.11.99
4242
# Use manifest from source files
43-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/control-plane-components.yaml"
43+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-alpha.2/control-plane-components.yaml"
4444
type: "url"
45-
contract: v1beta1
45+
contract: v1beta2
4646
files:
47-
- sourcePath: "../data/shared/capi/v1.10/metadata.yaml"
47+
- sourcePath: "../data/shared/capi/v1.11/metadata.yaml"
4848
replacements:
4949
- old: "imagePullPolicy: Always"
5050
new: "imagePullPolicy: IfNotPresent"
5151

5252
- name: vsphere
5353
type: InfrastructureProvider
5454
versions:
55-
- name: v1.13.0
55+
- name: v1.14.99
5656
# Use manifest from source files
57-
value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.13.0/infrastructure-components.yaml"
57+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.14.0-alpha.2/infrastructure-components.yaml"
5858
type: "url"
5959
contract: v1beta1
6060
files:

‎test/e2e/cpi_vm_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
k8stypes "k8s.io/apimachinery/pkg/types"
1717
"k8s.io/klog/v2"
18-
"sigs.k8s.io/cluster-api/api/v1beta1"
18+
"sigs.k8s.io/cluster-api/api/core/v1beta2"
1919
"sigs.k8s.io/cluster-api/test/framework"
2020
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2121
)
@@ -44,8 +44,8 @@ func getWorkerNode() (*corev1.Node, error) {
4444
}
4545

4646
// getWorkerMachine retrieves the CAPI machine object with name from the boostrap cluster
47-
func getWorkerMachine(name string) (*v1beta1.Machine, error) {
48-
machineList := &v1beta1.MachineList{}
47+
func getWorkerMachine(name string) (*v1beta2.Machine, error) {
48+
machineList := &v1beta2.MachineList{}
4949
err := proxy.GetClient().List(ctx, machineList)
5050
if err != nil {
5151
return nil, errors.New("failed to list Machines")
@@ -62,7 +62,7 @@ func getWorkerMachine(name string) (*v1beta1.Machine, error) {
6262

6363
// deleteWorkerMachine deletes the CAPI machine object with name from the boostrap cluster
6464
func deleteWorkerMachine(name string) error {
65-
machine := &v1beta1.Machine{
65+
machine := &v1beta2.Machine{
6666
ObjectMeta: metav1.ObjectMeta{
6767
Name: name,
6868
Namespace: machineNamespace,
@@ -180,7 +180,7 @@ var _ = Describe("Restarting, recreating and deleting VMs", func() {
180180

181181
var originalWorkerNodeName string
182182
var workerNode *corev1.Node
183-
var workerMachine *v1beta1.Machine
183+
var workerMachine *v1beta2.Machine
184184
var workerVM *object.VirtualMachine
185185

186186
BeforeEach(func() {

‎test/e2e/go.mod‎

Lines changed: 42 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,44 @@ module k8s.io/cloud-provider-vsphere/test/e2e
22

33
go 1.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2
66

7-
replace sigs.k8s.io/cluster-api-provider-vsphere => sigs.k8s.io/cluster-api-provider-vsphere v1.13.0
7+
replace sigs.k8s.io/cluster-api-provider-vsphere => sigs.k8s.io/cluster-api-provider-vsphere v1.14.0-alpha.2
88

9-
replace sigs.k8s.io/cluster-api-provider-vsphere/test => sigs.k8s.io/cluster-api-provider-vsphere/test v1.13.0
9+
replace sigs.k8s.io/cluster-api-provider-vsphere/test => sigs.k8s.io/cluster-api-provider-vsphere/test v1.14.0-alpha.2
1010

11-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.1
11+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.11.0-alpha.2
1212

1313
require (
1414
github.com/onsi/ginkgo/v2 v2.23.4
1515
github.com/onsi/gomega v1.37.0
1616
github.com/vmware/govmomi v0.51.0
17-
k8s.io/api v0.32.3
18-
k8s.io/apimachinery v0.32.3
19-
k8s.io/client-go v0.32.3
17+
k8s.io/api v0.33.2
18+
k8s.io/apimachinery v0.33.2
19+
k8s.io/client-go v0.33.2
2020
k8s.io/klog/v2 v2.130.1
2121
sigs.k8s.io/cluster-api v0.0.0
2222
sigs.k8s.io/cluster-api-provider-vsphere/test v0.0.0-00010101000000-000000000000
2323
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
24-
sigs.k8s.io/controller-runtime v0.20.4
24+
sigs.k8s.io/controller-runtime v0.21.0
2525
)
2626

2727
require (
2828
al.essio.dev/pkg/shellescape v1.5.1 // indirect
29-
cel.dev/expr v0.18.0 // indirect
30-
dario.cat/mergo v1.0.1 // indirect
3129
github.com/BurntSushi/toml v1.4.0 // indirect
3230
github.com/MakeNowJust/heredoc v1.0.0 // indirect
33-
github.com/Masterminds/goutils v1.1.1 // indirect
34-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
35-
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3631
github.com/Microsoft/go-winio v0.6.1 // indirect
3732
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
3833
github.com/adrg/xdg v0.5.3 // indirect
39-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
40-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4134
github.com/beorn7/perks v1.0.1 // indirect
4235
github.com/blang/semver/v4 v4.0.0 // indirect
43-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4436
github.com/cespare/xxhash/v2 v2.3.0 // indirect
45-
github.com/cloudflare/circl v1.3.7 // indirect
37+
github.com/cloudflare/circl v1.6.1 // indirect
38+
github.com/containerd/errdefs v1.0.0 // indirect
39+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4640
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4741
github.com/distribution/reference v0.6.0 // indirect
48-
github.com/docker/docker v28.0.2+incompatible // indirect
42+
github.com/docker/docker v28.3.0+incompatible // indirect
4943
github.com/docker/go-connections v0.5.0 // indirect
5044
github.com/docker/go-units v0.5.0 // indirect
5145
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -55,38 +49,30 @@ require (
5549
github.com/felixge/httpsnoop v1.0.4 // indirect
5650
github.com/fsnotify/fsnotify v1.8.0 // indirect
5751
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
58-
github.com/go-logr/logr v1.4.2 // indirect
52+
github.com/go-logr/logr v1.4.3 // indirect
5953
github.com/go-logr/stdr v1.2.2 // indirect
6054
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6155
github.com/go-openapi/jsonreference v0.20.2 // indirect
6256
github.com/go-openapi/swag v0.23.0 // indirect
6357
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
64-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
58+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
6559
github.com/gobuffalo/flect v1.0.3 // indirect
6660
github.com/gogo/protobuf v1.3.2 // indirect
67-
github.com/golang/protobuf v1.5.4 // indirect
6861
github.com/google/btree v1.1.3 // indirect
69-
github.com/google/cel-go v0.22.0 // indirect
7062
github.com/google/gnostic-models v0.6.9 // indirect
7163
github.com/google/go-cmp v0.7.0 // indirect
7264
github.com/google/go-github/v53 v53.2.0 // indirect
7365
github.com/google/go-querystring v1.1.0 // indirect
74-
github.com/google/gofuzz v1.2.0 // indirect
7566
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
76-
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
7767
github.com/google/uuid v1.6.0 // indirect
7868
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
79-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
80-
github.com/huandu/xstrings v1.5.0 // indirect
8169
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8270
github.com/josharian/intern v1.0.0 // indirect
8371
github.com/json-iterator/go v1.1.12 // indirect
8472
github.com/mailru/easyjson v0.7.7 // indirect
8573
github.com/mattn/go-colorable v0.1.13 // indirect
8674
github.com/mattn/go-isatty v0.0.20 // indirect
8775
github.com/mattn/go-runewidth v0.0.14 // indirect
88-
github.com/mitchellh/copystructure v1.2.0 // indirect
89-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9076
github.com/moby/docker-image-spec v1.3.1 // indirect
9177
github.com/moby/spdystream v0.5.0 // indirect
9278
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -99,62 +85,54 @@ require (
9985
github.com/pelletier/go-toml v1.9.5 // indirect
10086
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
10187
github.com/pkg/errors v0.9.1 // indirect
102-
github.com/prometheus/client_golang v1.19.1 // indirect
88+
github.com/prometheus/client_golang v1.22.0 // indirect
10389
github.com/prometheus/client_model v0.6.1 // indirect
104-
github.com/prometheus/common v0.55.0 // indirect
90+
github.com/prometheus/common v0.62.0 // indirect
10591
github.com/prometheus/procfs v0.15.1 // indirect
10692
github.com/rivo/uniseg v0.4.2 // indirect
10793
github.com/sagikazarmark/locafero v0.7.0 // indirect
108-
github.com/shopspring/decimal v1.4.0 // indirect
10994
github.com/sourcegraph/conc v0.3.0 // indirect
11095
github.com/spf13/afero v1.12.0 // indirect
11196
github.com/spf13/cast v1.7.1 // indirect
11297
github.com/spf13/cobra v1.9.1 // indirect
11398
github.com/spf13/pflag v1.0.6 // indirect
114-
github.com/spf13/viper v1.20.0 // indirect
115-
github.com/stoewer/go-strcase v1.3.0 // indirect
99+
github.com/spf13/viper v1.20.1 // indirect
116100
github.com/subosito/gotenv v1.6.0 // indirect
117-
github.com/valyala/fastjson v1.6.4 // indirect
118101
github.com/x448/float16 v0.8.4 // indirect
119-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
120-
go.opentelemetry.io/otel v1.29.0 // indirect
121-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
122-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
102+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
104+
go.opentelemetry.io/otel v1.33.0 // indirect
123105
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
125-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
126-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
127-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
106+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
107+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
128108
go.uber.org/automaxprocs v1.6.0 // indirect
129109
go.uber.org/multierr v1.11.0 // indirect
130-
golang.org/x/crypto v0.37.0 // indirect
131-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
132-
golang.org/x/mod v0.24.0 // indirect
133-
golang.org/x/net v0.39.0 // indirect
134-
golang.org/x/oauth2 v0.28.0 // indirect
135-
golang.org/x/sync v0.14.0 // indirect
136-
golang.org/x/sys v0.32.0 // indirect
137-
golang.org/x/term v0.31.0 // indirect
138-
golang.org/x/text v0.25.0 // indirect
110+
go.yaml.in/yaml/v2 v2.4.2 // indirect
111+
go.yaml.in/yaml/v3 v3.0.3 // indirect
112+
golang.org/x/crypto v0.39.0 // indirect
113+
golang.org/x/mod v0.25.0 // indirect
114+
golang.org/x/net v0.41.0 // indirect
115+
golang.org/x/oauth2 v0.30.0 // indirect
116+
golang.org/x/sync v0.15.0 // indirect
117+
golang.org/x/sys v0.33.0 // indirect
118+
golang.org/x/term v0.32.0 // indirect
119+
golang.org/x/text v0.26.0 // indirect
139120
golang.org/x/time v0.9.0 // indirect
140-
golang.org/x/tools v0.32.0 // indirect
121+
golang.org/x/tools v0.34.0 // indirect
141122
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
142-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
144-
google.golang.org/grpc v1.67.3 // indirect
145123
google.golang.org/protobuf v1.36.5 // indirect
146124
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
147125
gopkg.in/inf.v0 v0.9.1 // indirect
148126
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
150-
k8s.io/apiserver v0.32.3 // indirect
151-
k8s.io/cluster-bootstrap v0.32.3 // indirect
152-
k8s.io/component-base v0.32.3 // indirect
153-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
127+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
128+
k8s.io/apiserver v0.33.2 // indirect
129+
k8s.io/cluster-bootstrap v0.33.2 // indirect
130+
k8s.io/component-base v0.33.2 // indirect
131+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
154132
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
155-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
156133
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
157-
sigs.k8s.io/kind v0.27.0 // indirect
158-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
159-
sigs.k8s.io/yaml v1.4.0 // indirect
134+
sigs.k8s.io/kind v0.29.0 // indirect
135+
sigs.k8s.io/randfill v1.0.0 // indirect
136+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
137+
sigs.k8s.io/yaml v1.5.0 // indirect
160138
)

0 commit comments

Comments
 (0)