Rewrite conditions for ResourceGraphDefinition leveraging ConditionSet (#544)

This updates ResourceGraphDefinition to use the following conditions structure:

```
Ready
  ├─ ResourceGraphAccepted - This controller has accepted the spec.schema and spec.resources.
  ├─ KindReady - The CRD status created on behalf of this RGD.
  └─ ControllerReady - The status of the controller thread reconciling this resource.
```

---------

Signed-off-by: Scott Nichols <[email protected]>

Author: n3wscott

ATTRIBUTION.md

@@ -39,6 +39,7 @@ License version 2.0, we include the full text of the package's License below.
 * `k8s.io/apiserver`
 * `k8s.io/client-go`
 * `k8s.io/kube-openapi`
+* `k8s.io/utils`
 * `sigs.k8s.io/controller-runtime`
 * `sigs.k8s.io/release-utils`
 
@@ -3421,6 +3422,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+
 ### sigs.k8s.io/controller-runtime
 
 License Identifier: Apache-2.0
@@ -3799,7 +3802,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+#### k8s.io/utils
 
+License Identifier: Apache-2.0
 
 #### github.com/Azure/go-ansiterm
 

pkg/apis/condition_test.go api/v1alpha1/condition_test.gopkg/apis/condition_test.go renamed to api/v1alpha1/condition_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package apis
+package v1alpha1
 
 import (
 	"testing"

api/v1alpha1/conditions.go

@@ -22,6 +22,8 @@ import (
 // ConditionType is a type of condition for a resource.
 type ConditionType string
 
+func (c ConditionType) String() string { return string(c) }
+
 const (
 	// ResourceGraphDefinitionConditionTypeGraphVerified indicates the state of the directed
 	// acyclic graph (DAG) that kro uses to manage the resources in a
@@ -38,19 +40,6 @@ const (
 	ResourceGraphDefinitionConditionTypeReconcilerReady ConditionType = "ReconcilerReady"
 )
 
-const (
-	InstanceConditionTypeReady ConditionType = "Ready"
-
-	// InstanceConditionTypeProgressing used for Creating Deleting Migrating
-	InstanceConditionTypeProgressing ConditionType = "Progressing"
-
-	// InstanceConditionTypeDegraded used in unexpected situation, behaviour, need human intervention
-	InstanceConditionTypeDegraded ConditionType = "Degraded"
-
-	// InstanceConditionTypeError used in something is wrong but i'm going to try again
-	InstanceConditionTypeError ConditionType = "Error"
-)
-
 // Condition is the common struct used by all CRDs managed by ACK service
 // controllers to indicate terminal states  of the CR and its backend AWS
 // service API resource
@@ -76,18 +65,39 @@ type Condition struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
-// NewCondition returns a new Condition instance.
-func NewCondition(t ConditionType, status metav1.ConditionStatus, reason, message string) Condition {
-	return Condition{
-		Type:               t,
-		Status:             status,
-		LastTransitionTime: &metav1.Time{Time: metav1.Now().Time},
-		Reason:             &reason,
-		Message:            &message,
+func (c *Condition) IsTrue() bool {
+	if c == nil {
+		return false
 	}
+	return c.Status == metav1.ConditionTrue
 }
 
-func SetCondition(conditions []Condition, condition Condition) []Condition {
+func (c *Condition) IsFalse() bool {
+	if c == nil {
+		return false
+	}
+	return c.Status == metav1.ConditionFalse
+}
+
+func (c *Condition) IsUnknown() bool {
+	if c == nil {
+		return true
+	}
+	return c.Status == metav1.ConditionUnknown
+}
+
+func (c *Condition) GetStatus() metav1.ConditionStatus {
+	if c == nil {
+		return metav1.ConditionUnknown
+	}
+	return c.Status
+}
+
+// Conditions is a list of conditions.
+type Conditions []Condition
+
+// Set sets the provided condition into the conditions list, if it exists already the condition is replaced.
+func (conditions Conditions) Set(condition Condition) []Condition {
 	for i, c := range conditions {
 		if c.Type == condition.Type {
 			conditions[i] = condition
@@ -97,7 +107,8 @@ func SetCondition(conditions []Condition, condition Condition) []Condition {
 	return append(conditions, condition)
 }
 
-func HasCondition(conditions []Condition, t ConditionType) bool {
+// Has returns true if the conditions list contains the given condition type.
+func (conditions Conditions) Has(t ConditionType) bool {
 	return slices.ContainsFunc(conditions, func(c Condition) bool {
 		return c.Type == t
 	})

api/v1alpha1/types.go …1alpha1/resourcegraphdefinition_types.goapi/v1alpha1/types.go renamed to api/v1alpha1/resourcegraphdefinition_types.go api/v1alpha1/types.go renamed to api/v1alpha1/resourcegraphdefinition_types.go

@@ -151,7 +151,7 @@ type ResourceGraphDefinitionStatus struct {
 	// TopologicalOrder is the topological order of the resourcegraphdefinition graph
 	TopologicalOrder []string `json:"topologicalOrder,omitempty"`
 	// Conditions represent the latest available observations of an object's state
-	Conditions []Condition `json:"conditions,omitempty"`
+	Conditions Conditions `json:"conditions,omitempty"`
 	// Resources represents the resources, and their information (dependencies for now)
 	Resources []ResourceInformation `json:"resources,omitempty"`
 }
@@ -190,6 +190,14 @@ type ResourceGraphDefinition struct {
 	Status ResourceGraphDefinitionStatus `json:"status,omitempty"`
 }
 
+func (o *ResourceGraphDefinition) GetConditions() []Condition {
+	return o.Status.Conditions
+}
+
+func (o *ResourceGraphDefinition) SetConditions(conditions []Condition) {
+	o.Status.Conditions = conditions
+}
+
 //+kubebuilder:object:root=true
 
 // ResourceGraphDefinitionList contains a list of ResourceGraphDefinition

api/v1alpha1/zz_generated.deepcopy.go

@@ -18,22 +18,16 @@
 package apis
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/kro-run/kro/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// Condition aliases the upstream type and adds additional helper methods
-type Condition metav1.Condition
-
 type Object interface {
 	client.Object
-	GetConditions() []Condition
-	SetConditions([]Condition)
+	GetConditions() []v1alpha1.Condition
+	SetConditions([]v1alpha1.Condition)
 }
 
-// ConditionType is an upper-camel-cased condition type.
-type ConditionType string
-
 const (
 	// ConditionReady specifies that the resource is ready.
 	// For long-running resources.
@@ -42,31 +36,3 @@ const (
 	// For resource which run to completion.
 	ConditionSucceeded = "Succeeded"
 )
-
-func (c *Condition) IsTrue() bool {
-	if c == nil {
-		return false
-	}
-	return c.Status == metav1.ConditionTrue
-}
-
-func (c *Condition) IsFalse() bool {
-	if c == nil {
-		return false
-	}
-	return c.Status == metav1.ConditionFalse
-}
-
-func (c *Condition) IsUnknown() bool {
-	if c == nil {
-		return true
-	}
-	return c.Status == metav1.ConditionUnknown
-}
-
-func (c *Condition) GetStatus() metav1.ConditionStatus {
-	if c == nil {
-		return metav1.ConditionUnknown
-	}
-	return c.Status
-}