Fix cluster api dependencies

go.mod

@@ -52,6 +52,7 @@ require (
 	cloud.google.com/go/iam v1.1.7 // indirect
 	cloud.google.com/go/storage v1.40.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.2.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.3.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.0.0 // indirect
 	github.com/IBM/keyprotect-go-client v0.12.2 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
@@ -612,7 +613,7 @@ replace (
 	k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1
 	k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.9.7
 	mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20211002133954-f839ab2b2b11
-	sigs.k8s.io/cluster-api => github.com/openshift/cluster-api v0.0.0-20240513060301-2053e13cb0fd
+	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.3
 	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20221004090546-15ff2acd6c2f
 	sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/openshift/cluster-api-provider-aws/v2 v2.0.0-20240606085646-4efe12cbfebb
 	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20240702014946-44832d2da097

hack/update-go-module-dependencies.sh

@@ -76,10 +76,10 @@ for x in vendor/k8s.io/*; do
   esac
 done
 
-go mod edit -replace sigs.k8s.io/cluster-api="$(go list -mod=mod -m github.com/openshift/cluster-api@$RELEASE | sed -e 's/ /@/')"
-for x in aws/v2 azure openstack; do
-	go mod edit -replace sigs.k8s.io/cluster-api-provider-$x="$(go list -mod=mod -m github.com/openshift/cluster-api-provider-$x@$RELEASE | sed -e 's/ /@/')"
-done
+# From installer(-aro), they don't use forks anymore!
+go mod edit -replace sigs.k8s.io/cluster-api=sigs.k8s.io/[email protected]
+go mod edit -replace sigs.k8s.io/cluster-api-provider-aws/v2=sigs.k8s.io/cluster-api-provider-aws/[email protected]
+go mod edit -replace sigs.k8s.io/cluster-api-provider-azure=sigs.k8s.io/[email protected]
 
 for x in baremetal-operator baremetal-operator/apis baremetal-operator/pkg/hardwareutils cluster-api-provider-baremetal cluster-api-provider-metal3 cluster-api-provider-metal3/api; do
   go mod edit -replace github.com/metal3-io/$x="$(go list -mod=mod -m github.com/openshift/$x@$RELEASE | sed -e 's/ /@/')"