Skip to content

Commit

Permalink
Merge pull request #3107 from sbueringer/pr-bump-CAPI
Browse files Browse the repository at this point in the history
✨ Bump CAPI to v1.8.0-beta.0
  • Loading branch information
k8s-ci-robot authored Jul 17, 2024
2 parents 8f74a7d + 8ee157d commit 6b27129
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ IMPORT_BOSS_VER := v0.28.1
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss

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

BOSKOSCTL_BIN := boskosctl
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))
Expand Down
2 changes: 1 addition & 1 deletion controllers/vspherevm_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ func TestReconcileNormal_WaitingForIPAddrAllocation(t *testing.T) {
g := NewWithT(t)

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

vm := &infrav1.VSphereVM{}
vmKey := util.ObjectKey(vsphereVM)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere

go 1.22.0

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

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

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1009,8 +1009,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:KFPySfGd1z6rAZp5sSEHCnQKAojX+3Z4735TNCpQURs=
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
sigs.k8s.io/cluster-api v1.8.0-beta.0 h1:jIBdTz4xpYJDd4kmPktZeWzDp1PL6kZSMGdShE3xccg=
sigs.k8s.io/cluster-api v1.8.0-beta.0/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/clusterctl_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var (
capvReleaseMarkerPrefix = "go://sigs.k8s.io/cluster-api-provider-vsphere@v%s"
)

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

var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.9=>current, CAPI 1.6=>1.7) [supervisor] [ClusterClass]", func() {
var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.9=>current, CAPI 1.6=>1.8) [supervisor] [ClusterClass]", func() {
const specName = "clusterctl-upgrade-1.9-current" // prefix (clusterctl-upgrade) copied from CAPI
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
Expand Down
33 changes: 30 additions & 3 deletions test/e2e/config/vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,17 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: "v1.8.0" # supported release in the v1beta1 series
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/core-components.yaml"
type: "url"
contract: v1beta1
files:
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
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"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down Expand Up @@ -55,8 +64,17 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: "v1.8.0" # supported release in the v1beta1 series
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
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"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down Expand Up @@ -86,8 +104,17 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: "v1.8.0" # supported release in the v1beta1 series
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.0-beta.0/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
- sourcePath: "../data/shared/capi/v1.8/metadata.yaml"
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: "{go://sigs.k8s.io/[email protected]}" # supported release in the v1beta1 series
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"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
35 changes: 35 additions & 0 deletions test/e2e/data/shared/capi/v1.8/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# maps release series of major.minor to cluster-api contract version
# the contract version may change between minor or major versions, but *not*
# between patch versions.
#
# update this file only when a new major or minor version is released
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
kind: Metadata
releaseSeries:
- major: 1
minor: 8
contract: v1beta1
- major: 1
minor: 7
contract: v1beta1
- major: 1
minor: 6
contract: v1beta1
- major: 1
minor: 5
contract: v1beta1
- major: 1
minor: 4
contract: v1beta1
- major: 1
minor: 3
contract: v1beta1
- major: 1
minor: 2
contract: v1beta1
- major: 1
minor: 1
contract: v1beta1
- major: 1
minor: 0
contract: v1beta1
6 changes: 3 additions & 3 deletions test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test

go 1.22.0

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

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

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

Expand Down Expand Up @@ -32,7 +32,7 @@ require (
k8s.io/component-base v0.30.2
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20231127182322-b307cd553661
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a
sigs.k8s.io/cluster-api v1.8.0-beta.0
sigs.k8s.io/cluster-api-provider-vsphere v0.0.0-00010101000000-000000000000
sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000
sigs.k8s.io/controller-runtime v0.18.4
Expand Down
8 changes: 4 additions & 4 deletions test/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1090,10 +1090,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:KFPySfGd1z6rAZp5sSEHCnQKAojX+3Z4735TNCpQURs=
sigs.k8s.io/cluster-api v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
sigs.k8s.io/cluster-api/test v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a h1:xD6ZA+83/Eq2QOjyZTYQzmvHtRaMnC0TXv2qYYpbKkI=
sigs.k8s.io/cluster-api/test v1.7.0-rc.0.0.20240709155747-ffb86c5dee6a/go.mod h1:cFsEW5pEoqpdTEoxrn/AXqS4pbmhjUfu6h4MRfShFTs=
sigs.k8s.io/cluster-api v1.8.0-beta.0 h1:jIBdTz4xpYJDd4kmPktZeWzDp1PL6kZSMGdShE3xccg=
sigs.k8s.io/cluster-api v1.8.0-beta.0/go.mod h1:UsiGMX8dJWhr6nd3ZTsqWYNLv5bQ/unUYfjqFPpOAvg=
sigs.k8s.io/cluster-api/test v1.8.0-beta.0 h1:Db0BSJ/A4+MWzgYcb4GsLPURbN6nI0N9JvTfXvt5K3I=
sigs.k8s.io/cluster-api/test v1.8.0-beta.0/go.mod h1:cFsEW5pEoqpdTEoxrn/AXqS4pbmhjUfu6h4MRfShFTs=
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
Expand Down

0 comments on commit 6b27129

Please sign in to comment.