WIP: Refactor HelmChartReconciler

Signed-off-by: Hidde Beydals <hello@hidde.co>

Author: hiddeco

api/v1beta1/condition_types.go

@@ -24,6 +24,8 @@ const (
 	SourceVerifiedCondition string = "SourceVerified"
 
 	ArtifactAvailableCondition string = "ArtifactAvailable"
+
+	SourceRefReadyCondition string = "SourceRefReady"
 )
 
 const (

api/v1beta1/helmchart_types.go

@@ -18,13 +18,19 @@ package v1beta1
 
 import (
 	"github.com/fluxcd/pkg/apis/meta"
-	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // HelmChartKind is the string representation of a HelmChart.
 const HelmChartKind = "HelmChart"
 
+const (
+	DependenciesBuildCondition string = "DependenciesBuild"
+	ValuesFilesMergedCondition string = "ValuesFilesMerged"
+	ChartPackagedCondition     string = "ChartPackaged"
+	ChartReconciled            string = "ChartReconciled"
+)
+
 // HelmChartSpec defines the desired state of a Helm chart.
 type HelmChartSpec struct {
 	// The name or path the Helm chart is available at in the SourceRef.
@@ -122,52 +128,20 @@ const (
 	ChartPackageSucceededReason string = "ChartPackageSucceeded"
 )
 
-// HelmChartProgressing resets the conditions of the HelmChart to meta.Condition
-// of type meta.ReadyCondition with status 'Unknown' and meta.ProgressingReason
-// reason and message. It returns the modified HelmChart.
-func HelmChartProgressing(chart HelmChart) HelmChart {
-	chart.Status.ObservedGeneration = chart.Generation
-	chart.Status.URL = ""
-	chart.Status.Conditions = []metav1.Condition{}
-	meta.SetResourceCondition(&chart, meta.ReadyCondition, metav1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
-	return chart
-}
-
-// HelmChartReady sets the given Artifact and URL on the HelmChart and sets the
-// meta.ReadyCondition to 'True', with the given reason and message. It returns
-// the modified HelmChart.
-func HelmChartReady(chart HelmChart, artifact Artifact, url, reason, message string) HelmChart {
-	chart.Status.Artifact = &artifact
-	chart.Status.URL = url
-	meta.SetResourceCondition(&chart, meta.ReadyCondition, metav1.ConditionTrue, reason, message)
-	return chart
-}
-
-// HelmChartNotReady sets the meta.ReadyCondition on the given HelmChart to
-// 'False', with the given reason and message. It returns the modified
-// HelmChart.
-func HelmChartNotReady(chart HelmChart, reason, message string) HelmChart {
-	meta.SetResourceCondition(&chart, meta.ReadyCondition, metav1.ConditionFalse, reason, message)
-	return chart
-}
-
-// HelmChartReadyMessage returns the message of the meta.ReadyCondition with
-// status 'True', or an empty string.
-func HelmChartReadyMessage(chart HelmChart) string {
-	if c := apimeta.FindStatusCondition(chart.Status.Conditions, meta.ReadyCondition); c != nil {
-		if c.Status == metav1.ConditionTrue {
-			return c.Message
-		}
-	}
-	return ""
-}
-
 // GetArtifact returns the latest artifact from the source if present in the
 // status sub-resource.
 func (in *HelmChart) GetArtifact() *Artifact {
 	return in.Status.Artifact
 }
 
+func (in HelmChart) GetConditions() []metav1.Condition {
+	return in.Status.Conditions
+}
+
+func (in *HelmChart) SetConditions(conditions []metav1.Condition) {
+	in.Status.Conditions = conditions
+}
+
 // GetStatusConditions returns a pointer to the Status.Conditions slice
 func (in *HelmChart) GetStatusConditions() *[]metav1.Condition {
 	return &in.Status.Conditions

api/v1beta1/source.go

@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
@@ -29,9 +30,15 @@ const (
 // Source interface must be supported by all API types.
 // +k8s:deepcopy-gen=false
 type Source interface {
+	metav1.Object
+	runtime.Object
+
 	// GetArtifact returns the latest artifact from the source if present in the
 	// status sub-resource.
 	GetArtifact() *Artifact
+	// GetConditions returns the conditions of the source if present in the
+	// status sub-resource.
+	GetConditions() []metav1.Condition
 	// GetInterval returns the interval at which the source is updated.
 	GetInterval() metav1.Duration
 }

api/v1beta1/zz_generated.deepcopy.go

@@ -41,7 +41,7 @@ import (
 
 const (
 	bucketInterval = 1 * time.Second
-	bucketTimeout = 30 * time.Second
+	bucketTimeout  = 30 * time.Second
 )
 
 func TestBucketReconciler_Reconcile(t *testing.T) {