Merge pull request #13186 from sbueringer/pr-fix-cp-contract

🐛 Fix v1beta1 ControlPlane contract to handle .status.initialized correctly

Author: k8s-ci-robot

docs/book/src/developer/providers/contracts/control-plane.md

@@ -618,10 +618,10 @@ preserves compatibility with the deprecated v1beta1 contract; compatibility will
 
 With regards to initialization completed:
 
-Cluster API will continue to temporarily support ControlPlane resource using `status.initialize` and the `status.ready` field to
+Cluster API will continue to temporarily support ControlPlane resource using the `status.initialized` field to
 report initialization completed.
 
-After compatibility with the deprecated v1beta1 contract will be removed, `status.initialize` and `status.ready` fields in
+After compatibility with the deprecated v1beta1 contract will be removed, the `status.initialized` field in
 the ControlPlane resource will be ignored.
 
 </aside>

internal/contract/controlplane.go

@@ -102,7 +102,7 @@ func (c *ControlPlaneContract) StatusVersion() *String {
 func (c *ControlPlaneContract) Initialized(contractVersion string) *Bool {
 	if contractVersion == "v1beta1" {
 		return &Bool{
-			path: []string{"status", "ready"},
+			path: []string{"status", "initialized"},
 		}
 	}
 

internal/contract/controlplane_test.go

@@ -70,7 +70,7 @@ func TestControlPlane(t *testing.T) {
 		g.Expect(got).ToNot(BeNil())
 		g.Expect(*got).To(BeTrue())
 
-		g.Expect(ControlPlane().Initialized("v1beta1").Path()).To(Equal(Path{"status", "ready"}))
+		g.Expect(ControlPlane().Initialized("v1beta1").Path()).To(Equal(Path{"status", "initialized"}))
 
 		objV1beta1 := &unstructured.Unstructured{Object: map[string]interface{}{}}
 		err = ControlPlane().Initialized("v1beta1").Set(objV1beta1, true)