enhance status checks for crds and apiservices (#234)

Author: cbarbian-sap

pkg/reconciler/reconciler.go

@@ -612,6 +612,8 @@ func (r *Reconciler) Apply(ctx context.Context, inventory *[]*InventoryItem, obj
 	// that means, only if all objects of a wave are ready or completed, the next wave
 	// will be procesed; within each wave, objects which are instances of managed types
 	// will be applied after all other objects
+	// TODO: it would be good to have a special handling of APIService objects; probably, APIService objects
+	// should be applied after all regular (aka unmanaged until now) and before all managed objects
 	numNotManagedToBeApplied := 0
 	numUnready := 0
 	for k, object := range objects {

pkg/status/analyzer.go

@@ -45,6 +45,7 @@ func NewStatusAnalyzer(reconcilerName string) StatusAnalyzer {
 func (s *statusAnalyzer) ComputeStatus(object *unstructured.Unstructured) (Status, error) {
 	var extraConditions []string
 
+	// parse hints from annotations
 	if hint, ok := object.GetAnnotations()[s.reconcilerName+"/"+types.AnnotationKeySuffixStatusHint]; ok {
 		object = object.DeepCopy()
 		for _, hint := range strings.Split(hint, ",") {
@@ -59,6 +60,7 @@ func (s *statusAnalyzer) ComputeStatus(object *unstructured.Unstructured) (Statu
 			}
 			switch strcase.ToKebab(key) {
 			case types.StatusHintHasObservedGeneration:
+				// add an impossible status.observedGeneration if there is none, but the hint says there will be one
 				if hasValue {
 					return UnknownStatus, fmt.Errorf("status hint %s does not take a value", types.StatusHintHasObservedGeneration)
 				}
@@ -72,6 +74,7 @@ func (s *statusAnalyzer) ComputeStatus(object *unstructured.Unstructured) (Statu
 					}
 				}
 			case types.StatusHintHasReadyCondition:
+				// add an Unknown Ready condition if there is none, but the hint says there will be one
 				if hasValue {
 					return UnknownStatus, fmt.Errorf("status hint %s does not take a value", types.StatusHintHasReadyCondition)
 				}
@@ -115,12 +118,22 @@ func (s *statusAnalyzer) ComputeStatus(object *unstructured.Unstructured) (Statu
 		}
 	}
 
+	// add some well known extra conditions; note this might lead to duplicate checks, but that's ok
+	switch object.GroupVersionKind() {
+	case schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version: "v1", Kind: "CustomResourceDefinition"}:
+		extraConditions = append(extraConditions, "Established", "NamesAccepted")
+	case schema.GroupVersionKind{Group: "apiregistration.k8s.io", Version: "v1", Kind: "APIService"}:
+		extraConditions = append(extraConditions, "Available")
+	}
+
+	// retrieve status from upstream kstatus
 	res, err := kstatus.Compute(object)
 	if err != nil {
 		return UnknownStatus, err
 	}
 	status := Status(res.Status)
 
+	// check extra conditions
 	if status == CurrentStatus && len(extraConditions) > 0 {
 		objc, err := kstatus.GetObjectWithConditions(object.UnstructuredContent())
 		if err != nil {
@@ -142,6 +155,7 @@ func (s *statusAnalyzer) ComputeStatus(object *unstructured.Unstructured) (Statu
 		}
 	}
 
+	// special processing for some types
 	switch object.GroupVersionKind() {
 	case schema.GroupVersionKind{Group: "batch", Version: "v1", Kind: "Job"}:
 		// other than kstatus we want to consider jobs as InProgress if its pods are still running, resp. did not (yet) finish successfully