Merge pull request #2994 from Nordix/lentzi90/osmt-conditions

✨ Add conditions for OpenStackMachineTemplate

Author: k8s-ci-robot

api/v1beta1/openstackmachinetemplate_types.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // OpenStackMachineTemplateSpec defines the desired state of OpenStackMachineTemplate.
@@ -35,6 +36,12 @@ type OpenStackMachineTemplateStatus struct {
 	Capacity corev1.ResourceList `json:"capacity,omitempty"`
 	// +optional
 	NodeInfo NodeInfo `json:"nodeInfo,omitempty,omitzero"`
+
+	// Conditions defines current service state of the OpenStackMachineTemplate.
+	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
+	// (both during initial provisioning and after the initial provisioning is completed).
+	// +optional
+	Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
 }
 
 // NodeInfo contains information about the node's architecture and operating system.
@@ -81,3 +88,13 @@ func (r *OpenStackMachineTemplate) GetIdentityRef() (*string, *OpenStackIdentity
 	}
 	return nil, nil
 }
+
+// GetConditions returns the observations of the operational state of the OpenStackMachineTemplate resource.
+func (r *OpenStackMachineTemplate) GetConditions() clusterv1beta1.Conditions {
+	return r.Status.Conditions
+}
+
+// SetConditions sets the underlying service state of the OpenStackMachineTemplate to the predescribed clusterv1.Conditions.
+func (r *OpenStackMachineTemplate) SetConditions(conditions clusterv1beta1.Conditions) {
+	r.Status.Conditions = conditions
+}

api/v1beta1/zz_generated.deepcopy.go

@@ -35,6 +35,12 @@ type OpenStackMachineTemplateStatus struct {
 	Capacity corev1.ResourceList `json:"capacity,omitempty"`
 	// +optional
 	NodeInfo NodeInfo `json:"nodeInfo,omitempty,omitzero"`
+
+	// Conditions defines current service state of the OpenStackMachineTemplate.
+	// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
+	// (both during initial provisioning and after the initial provisioning is completed).
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // NodeInfo contains information about the node's architecture and operating system.
@@ -72,3 +78,13 @@ type OpenStackMachineTemplateList struct {
 func init() {
 	objectTypes = append(objectTypes, &OpenStackMachineTemplate{}, &OpenStackMachineTemplateList{})
 }
+
+// GetConditions returns the observations of the operational state of the OpenStackMachineTemplate resource.
+func (r *OpenStackMachineTemplate) GetConditions() []metav1.Condition {
+	return r.Status.Conditions
+}
+
+// SetConditions sets the underlying service state of the OpenStackMachineTemplate to the predescribed clusterv1.Conditions.
+func (r *OpenStackMachineTemplate) SetConditions(conditions []metav1.Condition) {
+	r.Status.Conditions = conditions
+}

api/v1beta2/openstackmachinetemplate_types.go

@@ -59,7 +59,6 @@ var (
 )
 
 var _ = Describe("OpenStackCluster controller", func() {
-	capiClusterName := "capi-cluster"
 	testClusterName := "test-cluster"
 	testNum := 0
 	bastionSpec := infrav1.OpenStackMachineSpec{

api/v1beta2/zz_generated.deepcopy.go

@@ -675,7 +675,6 @@ var _ = Describe("OpenStackMachine controller", func() {
 		testNum            int
 	)
 
-	capiClusterName := "capi-cluster"
 	testClusterName := "test-cluster"
 	testMachineName := "test-machine"
 	capiMachineName := "capi-machine"

cmd/models-schema/zz_generated.openapi.go

@@ -24,8 +24,10 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/tools/record"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
+	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -106,12 +108,6 @@ func (r *OpenStackMachineTemplateReconciler) Reconcile(ctx context.Context, req
 
 	log = log.WithValues("openStackCluster", infraCluster.Name)
 
-	clientScope, err := r.ScopeFactory.NewClientScopeFromObject(ctx, r.Client, r.CaCertificates, log, openStackMachineTemplate, infraCluster)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	scope := scope.NewWithLogger(clientScope, log)
-
 	// Initialize the patch helper
 	patchHelper, err := patch.NewHelper(openStackMachineTemplate, r.Client)
 	if err != nil {
@@ -127,6 +123,14 @@ func (r *OpenStackMachineTemplateReconciler) Reconcile(ctx context.Context, req
 		}
 	}()
 
+	clientScope, err := r.ScopeFactory.NewClientScopeFromObject(ctx, r.Client, r.CaCertificates, log, openStackMachineTemplate, infraCluster)
+	if err != nil {
+		v1beta1conditions.MarkFalse(openStackMachineTemplate, infrav1.OpenStackAuthenticationSucceeded, infrav1.OpenStackAuthenticationFailedReason, clusterv1beta1.ConditionSeverityError, "Failed to create OpenStack client scope: %v", err)
+		return ctrl.Result{}, err
+	}
+	v1beta1conditions.MarkTrue(openStackMachineTemplate, infrav1.OpenStackAuthenticationSucceeded)
+	scope := scope.NewWithLogger(clientScope, log)
+
 	// Handle non-deleted OpenStackMachineTemplates
 	if err := r.reconcileNormal(ctx, scope, openStackMachineTemplate); err != nil {
 		return ctrl.Result{}, err