Merge pull request #220 from bharath-b-rh/cm-235-istio-csr

CM-418,CM-419: Adds new istio-csr CRD and controller to manage lifecycle for the CR

Author: openshift-merge-bot[bot]

api/operator/v1alpha1/conditions.go

@@ -0,0 +1,67 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	// Degraded is the condition type used to inform state of the operator when
+	// it has failed with irrecoverable error like permission issues.
+	// DebugEnabled has the following options:
+	//   Status:
+	//   - True
+	//   - False
+	//   Reason:
+	//   - Failed
+	Degraded string = "Degraded"
+
+	// Ready is the condition type used to inform state of readiness of the
+	// operator to process istio-csr enabling requests.
+	//   Status:
+	//   - True
+	//   - False
+	//   Reason:
+	//   - Progressing
+	//   - Failed
+	//   - Ready: operand successfully deployed and ready
+	Ready string = "Ready"
+)
+
+const (
+	ReasonFailed string = "Failed"
+
+	ReasonReady string = "Ready"
+
+	ReasonInProgress string = "Progressing"
+)
+
+func (c *ConditionalStatus) GetCondition(t string) *metav1.Condition {
+	for i, cond := range c.Conditions {
+		if cond.Type == t {
+			return &c.Conditions[i]
+		}
+	}
+	return nil
+}
+
+func (c *ConditionalStatus) SetCondition(t string, cs metav1.ConditionStatus, reason, msg string) bool {
+	condition := c.GetCondition(t)
+	if condition == nil {
+		c.Conditions = append(c.Conditions, metav1.Condition{
+			Type:               t,
+			Status:             cs,
+			LastTransitionTime: metav1.Now(),
+			Reason:             reason,
+			Message:            msg,
+		})
+		return true
+	}
+	if condition.Status != cs || condition.Reason != reason {
+		condition.Status = cs
+		condition.LastTransitionTime = metav1.Now()
+		condition.Reason = reason
+		condition.Message = msg
+		return true
+	}
+	return false
+}

api/operator/v1alpha1/conditions_test.go

@@ -0,0 +1,149 @@
+package v1alpha1
+
+import (
+	"reflect"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestGetCondition(t *testing.T) {
+	tests := []struct {
+		name              string
+		conditionalStatus ConditionalStatus
+		condition         string
+		expectedCondition *metav1.Condition
+	}{
+		{
+			name: "requested condition present",
+			conditionalStatus: ConditionalStatus{
+				Conditions: []metav1.Condition{
+					{
+						Type:   Ready,
+						Status: metav1.ConditionTrue,
+						Reason: ReasonReady,
+					},
+					{
+						Type:   Degraded,
+						Status: metav1.ConditionFalse,
+						Reason: ReasonReady,
+					},
+				},
+			},
+			condition: Ready,
+			expectedCondition: &metav1.Condition{
+				Type:   Ready,
+				Status: metav1.ConditionTrue,
+				Reason: ReasonReady,
+			},
+		},
+		{
+			name: "requested condition not present",
+			conditionalStatus: ConditionalStatus{
+				Conditions: []metav1.Condition{
+					{
+						Type:   Ready,
+						Status: metav1.ConditionTrue,
+						Reason: ReasonReady,
+					},
+					{
+						Type:   Degraded,
+						Status: metav1.ConditionFalse,
+						Reason: ReasonReady,
+					},
+				},
+			},
+			condition:         "TestCondition",
+			expectedCondition: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cond := tt.conditionalStatus.GetCondition(tt.condition)
+			if !reflect.DeepEqual(tt.expectedCondition, cond) {
+				t.Errorf("GetCondition() condition: %v, expectedCondition: %v", cond, tt.expectedCondition)
+			}
+		})
+	}
+}
+
+func TestSetCondition(t *testing.T) {
+	tests := []struct {
+		name              string
+		conditionalStatus ConditionalStatus
+		condition         string
+		conditionStatus   metav1.ConditionStatus
+		conditionReason   string
+		conditionMessage  string
+		conditionUpdated  bool
+	}{
+		{
+			name: "condition does not exist",
+			conditionalStatus: ConditionalStatus{
+				Conditions: []metav1.Condition{
+					{
+						Type:   Degraded,
+						Status: metav1.ConditionFalse,
+						Reason: ReasonReady,
+					},
+				},
+			},
+			condition:        Ready,
+			conditionStatus:  metav1.ConditionTrue,
+			conditionReason:  ReasonReady,
+			conditionUpdated: true,
+		},
+		{
+			name: "condition exists and status changed",
+			conditionalStatus: ConditionalStatus{
+				Conditions: []metav1.Condition{
+					{
+						Type:   Ready,
+						Status: metav1.ConditionTrue,
+						Reason: ReasonReady,
+					},
+					{
+						Type:   Degraded,
+						Status: metav1.ConditionFalse,
+						Reason: ReasonReady,
+					},
+				},
+			},
+			condition:        Ready,
+			conditionStatus:  metav1.ConditionFalse,
+			conditionReason:  ReasonReady,
+			conditionUpdated: true,
+		},
+		{
+			name: "condition exists and no new change",
+			conditionalStatus: ConditionalStatus{
+				Conditions: []metav1.Condition{
+					{
+						Type:   Ready,
+						Status: metav1.ConditionTrue,
+						Reason: ReasonReady,
+					},
+					{
+						Type:   Degraded,
+						Status: metav1.ConditionFalse,
+						Reason: ReasonReady,
+					},
+				},
+			},
+			condition:        Ready,
+			conditionStatus:  metav1.ConditionTrue,
+			conditionReason:  ReasonReady,
+			conditionUpdated: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			updated := tt.conditionalStatus.SetCondition(tt.condition, tt.conditionStatus, tt.conditionReason, tt.conditionMessage)
+			if updated != tt.conditionUpdated {
+				t.Errorf("SetCondition() updated: %v, conditionUpdated: %v", updated, tt.conditionUpdated)
+			}
+		})
+	}
+}