Skip to content

Commit 6b27129

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3107 from sbueringer/pr-bump-CAPI
✨ Bump CAPI to v1.8.0-beta.0
2 parents 8f74a7d + 8ee157d commit 6b27129

File tree

9 files changed

+79
-17
lines changed

9 files changed

+79
-17
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ IMPORT_BOSS_VER := v0.28.1
184184
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
185185
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
186186

187-
CAPI_HACK_TOOLS_VER := ef04465b2ba76214eea570e27e8146c96412e32a # Note: this is the commit ID of CAPI v1.7.1
187+
CAPI_HACK_TOOLS_VER := 377bd194f91b46cf992e9a3a808f553738538ca4 # Note: this is the commit ID of CAPI v1.8.0-beta.0
188188

189189
BOSKOSCTL_BIN := boskosctl
190190
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎controllers/vspherevm_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func TestReconcileNormal_WaitingForIPAddrAllocation(t *testing.T) {
305305
g := NewWithT(t)
306306

307307
_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: util.ObjectKey(vsphereVM)})
308-
g.Expect(err).To(HaveOccurred())
308+
g.Expect(err).ToNot(HaveOccurred())
309309

310310
vm := &infrav1.VSphereVM{}
311311
vmKey := util.ObjectKey(vsphereVM)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere
22

33
go 1.22.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-beta.0
66

77
replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505
88

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1009,8 +1009,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10091009
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
10101010
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
10111011
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
1012-
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:KFPySfGd1z6rAZp5sSEHCnQKAojX+3Z4735TNCpQURs=
1013-
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
1012+
sigs.k8s.io/cluster-api v1.8.0-beta.0 h1:jIBdTz4xpYJDd4kmPktZeWzDp1PL6kZSMGdShE3xccg=
1013+
sigs.k8s.io/cluster-api v1.8.0-beta.0/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
10141014
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
10151015
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
10161016
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=

‎test/e2e/clusterctl_upgrade_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
capvReleaseMarkerPrefix = "go://sigs.k8s.io/cluster-api-provider-vsphere@v%s"
3737
)
3838

39-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.10=>current, CAPI 1.7=>1.7) [supervisor] [ClusterClass]", func() {
39+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.10=>current, CAPI 1.7=>1.8) [supervisor] [ClusterClass]", func() {
4040
const specName = "clusterctl-upgrade-1.10-current" // prefix (clusterctl-upgrade) copied from CAPI
4141
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
4242
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -74,7 +74,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.10
7474
}, WithIP("WORKLOAD_CONTROL_PLANE_ENDPOINT_IP"))
7575
})
7676

77-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.9=>current, CAPI 1.6=>1.7) [supervisor] [ClusterClass]", func() {
77+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.9=>current, CAPI 1.6=>1.8) [supervisor] [ClusterClass]", func() {
7878
const specName = "clusterctl-upgrade-1.9-current" // prefix (clusterctl-upgrade) copied from CAPI
7979
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
8080
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {

‎test/e2e/config/vsphere.yaml

+30-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ providers:
2424
- name: cluster-api
2525
type: CoreProvider
2626
versions:
27+
- name: "v1.8.0" # supported release in the v1beta1 series
28+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/core-components.yaml"
29+
type: "url"
30+
contract: v1beta1
31+
files:
32+
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
33+
replacements:
34+
- old: "imagePullPolicy: Always"
35+
new: "imagePullPolicy: IfNotPresent"
2736
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
28-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20240701/core-components.yaml" # "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
37+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
2938
type: "url"
3039
contract: v1beta1
3140
files:
@@ -55,8 +64,17 @@ providers:
5564
- name: kubeadm
5665
type: BootstrapProvider
5766
versions:
67+
- name: "v1.8.0" # supported release in the v1beta1 series
68+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/bootstrap-components.yaml"
69+
type: "url"
70+
contract: v1beta1
71+
files:
72+
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
73+
replacements:
74+
- old: "imagePullPolicy: Always"
75+
new: "imagePullPolicy: IfNotPresent"
5876
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
59-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20240701/bootstrap-components.yaml" # "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
77+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
6078
type: "url"
6179
contract: v1beta1
6280
files:
@@ -86,8 +104,17 @@ providers:
86104
- name: kubeadm
87105
type: ControlPlaneProvider
88106
versions:
107+
- name: "v1.8.0" # supported release in the v1beta1 series
108+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/control-plane-components.yaml"
109+
type: "url"
110+
contract: v1beta1
111+
files:
112+
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
113+
replacements:
114+
- old: "imagePullPolicy: Always"
115+
new: "imagePullPolicy: IfNotPresent"
89116
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
90-
value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20240701/control-plane-components.yaml" # "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
117+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
91118
type: "url"
92119
contract: v1beta1
93120
files:

‎test/e2e/data/shared/capi/v1.8/metadata.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# maps release series of major.minor to cluster-api contract version
2+
# the contract version may change between minor or major versions, but *not*
3+
# between patch versions.
4+
#
5+
# update this file only when a new major or minor version is released
6+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
7+
kind: Metadata
8+
releaseSeries:
9+
- major: 1
10+
minor: 8
11+
contract: v1beta1
12+
- major: 1
13+
minor: 7
14+
contract: v1beta1
15+
- major: 1
16+
minor: 6
17+
contract: v1beta1
18+
- major: 1
19+
minor: 5
20+
contract: v1beta1
21+
- major: 1
22+
minor: 4
23+
contract: v1beta1
24+
- major: 1
25+
minor: 3
26+
contract: v1beta1
27+
- major: 1
28+
minor: 2
29+
contract: v1beta1
30+
- major: 1
31+
minor: 1
32+
contract: v1beta1
33+
- major: 1
34+
minor: 0
35+
contract: v1beta1

‎test/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test
22

33
go 1.22.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-beta.0
66

7-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a
7+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.8.0-beta.0
88

99
replace sigs.k8s.io/cluster-api-provider-vsphere => ../
1010

@@ -32,7 +32,7 @@ require (
3232
k8s.io/component-base v0.30.2
3333
k8s.io/klog/v2 v2.120.1
3434
k8s.io/utils v0.0.0-20231127182322-b307cd553661
35-
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a
35+
sigs.k8s.io/cluster-api v1.8.0-beta.0
3636
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
3737
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
3838
sigs.k8s.io/controller-runtime v0.18.4

‎test/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1090,10 +1090,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10901090
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
10911091
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
10921092
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
1093-
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:KFPySfGd1z6rAZp5sSEHCnQKAojX+3Z4735TNCpQURs=
1094-
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
1095-
sigs.k8s.io/cluster-api/test v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:xD6ZA+83/Eq2QOjyZTYQzmvHtRaMnC0TXv2qYYpbKkI=
1096-
sigs.k8s.io/cluster-api/test v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:cFsEW5pEoqpdTEoxrn/AXqS4pbmhjUfu6h4MRfShFTs=
1093+
sigs.k8s.io/cluster-api v1.8.0-beta.0 h1:jIBdTz4xpYJDd4kmPktZeWzDp1PL6kZSMGdShE3xccg=
1094+
sigs.k8s.io/cluster-api v1.8.0-beta.0/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
1095+
sigs.k8s.io/cluster-api/test v1.8.0-beta.0 h1:Db0BSJ/A4+MWzgYcb4GsLPURbN6nI0N9JvTfXvt5K3I=
1096+
sigs.k8s.io/cluster-api/test v1.8.0-beta.0/go.mod h1:cFsEW5pEoqpdTEoxrn/AXqS4pbmhjUfu6h4MRfShFTs=
10971097
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
10981098
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
10991099
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=

0 commit comments

Comments
 (0)