changes for 0.11 release

okozachenko1203 · okozachenko1203 · commit 8d9485674633 · 2025-09-11T02:08:19.000+02:00
Signed-off-by: okozachenko1203 &lt;okozachenko1203@gmail.com&gt;
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -379,7 +379,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 
 	if instanceStatus == nil {
 		conditions.MarkFalse(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceDeletedReason, clusterv1.ConditionSeverityError, infrav1.ServerUnexpectedDeletedMessage)
-		openStackMachine.SetFailure(capoerrors.DeprecatedCAPIUpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:stylecheck // This error is not used as an error
+		openStackMachine.SetFailure(capierrors.UpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:stylecheck // This error is not used as an error
 		return ctrl.Result{}, nil
 	}
 
diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go
@@ -55,8 +55,8 @@ import (
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/k-orc/openstack-resource-controller/pkg/utils/ssa"
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-openstack/internal/util/ssa"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/applyconfiguration/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
 )

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope`
`379`	`379`
`380`	`380`	`if instanceStatus == nil {`
`381`	`381`	`conditions.MarkFalse(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceDeletedReason, clusterv1.ConditionSeverityError, infrav1.ServerUnexpectedDeletedMessage)`
`382`		`- openStackMachine.SetFailure(capoerrors.DeprecatedCAPIUpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:stylecheck // This error is not used as an error`
	`382`	`+ openStackMachine.SetFailure(capierrors.UpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:stylecheck // This error is not used as an error`
`383`	`383`	`return ctrl.Result{}, nil`
`384`	`384`	`}`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ import (`
`55`	`55`	`"sigs.k8s.io/cluster-api/test/framework/clusterctl"`
`56`	`56`	`crclient "sigs.k8s.io/controller-runtime/pkg/client"`
`57`	`57`
	`58`	`+ "github.com/k-orc/openstack-resource-controller/pkg/utils/ssa"`
`58`	`59`	`infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"`
`59`		`- "sigs.k8s.io/cluster-api-provider-openstack/internal/util/ssa"`
`60`	`60`	`"sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/applyconfiguration/api/v1beta1"`
`61`	`61`	`"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"`
`62`	`62`	`)`