Refactor to adopt k8s standardized Condition type

api/go.mod

@@ -3,7 +3,7 @@ module github.com/fluxcd/source-controller/api
 go 1.15
 
 require (
-	github.com/fluxcd/pkg/apis/meta v0.2.0
+	github.com/fluxcd/pkg/apis/meta v0.4.0
 	k8s.io/api v0.19.3
 	k8s.io/apimachinery v0.19.3
 	sigs.k8s.io/controller-runtime v0.6.3

api/go.sum

@@ -63,6 +63,10 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fluxcd/pkg/apis/meta v0.2.0 h1:bxoFQtZM6OLLj0+n3h6ga7IEWUtGEDJPc65OWiXSMvY=
 github.com/fluxcd/pkg/apis/meta v0.2.0/go.mod h1:50RLLSfqM4LlQrh/+5LiJVf7Hjdthee8WDdXBvpjBdA=
+github.com/fluxcd/pkg/apis/meta v0.3.0 h1:o2YkfGgf0j8sKeZs8cBmmmMKLA7kEoS1qYViOial1Ds=
+github.com/fluxcd/pkg/apis/meta v0.3.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0=
+github.com/fluxcd/pkg/apis/meta v0.4.0 h1:JChqB9GGgorW9HWKxirTVV0rzrcLyzBaVjinmqZ0iHA=
+github.com/fluxcd/pkg/apis/meta v0.4.0/go.mod h1:wOzQQx8CdtUQCGaLzqGu4QgnNxYkI6/wvdvlovxWhF0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=

api/v1beta1/bucket_types.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"github.com/fluxcd/pkg/apis/meta"
 	corev1 "k8s.io/api/core/v1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -85,7 +86,7 @@ type BucketStatus struct {
 
 	// Conditions holds the conditions for the Bucket.
 	// +optional
-	Conditions []meta.Condition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// URL is the download link for the artifact output of the last Bucket sync.
 	// +optional
@@ -106,52 +107,39 @@ const (
 	BucketOperationFailedReason string = "BucketOperationFailed"
 )
 
-// BucketProgressing resets the conditions of the Bucket to meta.Condition of
+// BucketProgressing resets the conditions of the Bucket to metav1.Condition of
 // type meta.ReadyCondition with status 'Unknown' and meta.ProgressingReason
 // reason and message. It returns the modified Bucket.
 func BucketProgressing(bucket Bucket) Bucket {
 	bucket.Status.ObservedGeneration = bucket.Generation
 	bucket.Status.URL = ""
-	bucket.Status.Conditions = []meta.Condition{}
-	SetBucketCondition(&bucket, meta.ReadyCondition, corev1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
+	bucket.Status.Conditions = []metav1.Condition{}
+	meta.SetResourceCondition(&bucket, meta.ReadyCondition, metav1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
 	return bucket
 }
 
-// SetBucketCondition sets the given condition with the given status, reason and
-// message on the Bucket.
-func SetBucketCondition(bucket *Bucket, conditionType string, status corev1.ConditionStatus, reason, message string) {
-	bucket.Status.Conditions = meta.FilterOutCondition(bucket.Status.Conditions, conditionType)
-	bucket.Status.Conditions = append(bucket.Status.Conditions, meta.Condition{
-		Type:               conditionType,
-		Status:             status,
-		LastTransitionTime: metav1.Now(),
-		Reason:             reason,
-		Message:            message,
-	})
-}
-
 // BucketReady sets the given Artifact and URL on the Bucket and sets the
 // meta.ReadyCondition to 'True', with the given reason and message. It returns
 // the modified Bucket.
 func BucketReady(bucket Bucket, artifact Artifact, url, reason, message string) Bucket {
 	bucket.Status.Artifact = &artifact
 	bucket.Status.URL = url
-	SetBucketCondition(&bucket, meta.ReadyCondition, corev1.ConditionTrue, reason, message)
+	meta.SetResourceCondition(&bucket, meta.ReadyCondition, metav1.ConditionTrue, reason, message)
 	return bucket
 }
 
 // BucketNotReady sets the meta.ReadyCondition on the Bucket to 'False', with
 // the given reason and message. It returns the modified Bucket.
 func BucketNotReady(bucket Bucket, reason, message string) Bucket {
-	SetBucketCondition(&bucket, meta.ReadyCondition, corev1.ConditionFalse, reason, message)
+	meta.SetResourceCondition(&bucket, meta.ReadyCondition, metav1.ConditionFalse, reason, message)
 	return bucket
 }
 
-// BucketReadyMessage returns the message of the meta.Condition of type
+// BucketReadyMessage returns the message of the metav1.Condition of type
 // meta.ReadyCondition with status 'True' if present, or an empty string.
 func BucketReadyMessage(bucket Bucket) string {
-	if c := meta.GetCondition(bucket.Status.Conditions, meta.ReadyCondition); c != nil {
-		if c.Status == corev1.ConditionTrue {
+	if c := apimeta.FindStatusCondition(bucket.Status.Conditions, meta.ReadyCondition); c != nil {
+		if c.Status == metav1.ConditionTrue {
 			return c.Message
 		}
 	}
@@ -164,6 +152,11 @@ func (in *Bucket) GetArtifact() *Artifact {
 	return in.Status.Artifact
 }
 
+// GetStatusConditions returns a pointer to the Status.Conditions slice
+func (in *Bucket) GetStatusConditions() *[]metav1.Condition {
+	return &in.Status.Conditions
+}
+
 // GetInterval returns the interval at which the source is updated.
 func (in *Bucket) GetInterval() metav1.Duration {
 	return in.Spec.Interval

api/v1beta1/gitrepository_types.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"github.com/fluxcd/pkg/apis/meta"
 	corev1 "k8s.io/api/core/v1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -105,7 +106,7 @@ type GitRepositoryStatus struct {
 
 	// Conditions holds the conditions for the GitRepository.
 	// +optional
-	Conditions []meta.Condition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// URL is the download link for the artifact output of the last repository
 	// sync.
@@ -128,53 +129,40 @@ const (
 )
 
 // GitRepositoryProgressing resets the conditions of the GitRepository to
-// meta.Condition of type meta.ReadyCondition with status 'Unknown' and
+// metav1.Condition of type meta.ReadyCondition with status 'Unknown' and
 // meta.ProgressingReason reason and message. It returns the modified
 // GitRepository.
 func GitRepositoryProgressing(repository GitRepository) GitRepository {
 	repository.Status.ObservedGeneration = repository.Generation
 	repository.Status.URL = ""
-	repository.Status.Conditions = []meta.Condition{}
-	SetGitRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
+	repository.Status.Conditions = []metav1.Condition{}
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
 	return repository
 }
 
-// SetGitRepositoryCondition sets the given condition with the given status,
-// reason and message on the GitRepository.
-func SetGitRepositoryCondition(repository *GitRepository, condition string, status corev1.ConditionStatus, reason, message string) {
-	repository.Status.Conditions = meta.FilterOutCondition(repository.Status.Conditions, condition)
-	repository.Status.Conditions = append(repository.Status.Conditions, meta.Condition{
-		Type:               condition,
-		Status:             status,
-		LastTransitionTime: metav1.Now(),
-		Reason:             reason,
-		Message:            message,
-	})
-}
-
 // GitRepositoryReady sets the given Artifact and URL on the GitRepository and
 // sets the meta.ReadyCondition to 'True', with the given reason and message. It
 // returns the modified GitRepository.
 func GitRepositoryReady(repository GitRepository, artifact Artifact, url, reason, message string) GitRepository {
 	repository.Status.Artifact = &artifact
 	repository.Status.URL = url
-	SetGitRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionTrue, reason, message)
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionTrue, reason, message)
 	return repository
 }
 
 // GitRepositoryNotReady sets the meta.ReadyCondition on the given GitRepository
 // to 'False', with the given reason and message. It returns the modified
 // GitRepository.
 func GitRepositoryNotReady(repository GitRepository, reason, message string) GitRepository {
-	SetGitRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionFalse, reason, message)
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionFalse, reason, message)
 	return repository
 }
 
-// GitRepositoryReadyMessage returns the message of the meta.Condition of type
+// GitRepositoryReadyMessage returns the message of the metav1.Condition of type
 // meta.ReadyCondition with status 'True' if present, or an empty string.
 func GitRepositoryReadyMessage(repository GitRepository) string {
-	if c := meta.GetCondition(repository.Status.Conditions, meta.ReadyCondition); c != nil {
-		if c.Status == corev1.ConditionTrue {
+	if c := apimeta.FindStatusCondition(repository.Status.Conditions, meta.ReadyCondition); c != nil {
+		if c.Status == metav1.ConditionTrue {
 			return c.Message
 		}
 	}
@@ -187,6 +175,11 @@ func (in *GitRepository) GetArtifact() *Artifact {
 	return in.Status.Artifact
 }
 
+// GetStatusConditions returns a pointer to the Status.Conditions slice
+func (in *GitRepository) GetStatusConditions() *[]metav1.Condition {
+	return &in.Status.Conditions
+}
+
 // GetInterval returns the interval at which the source is updated.
 func (in *GitRepository) GetInterval() metav1.Duration {
 	return in.Spec.Interval

api/v1beta1/helmchart_types.go

@@ -18,7 +18,7 @@ package v1beta1
 
 import (
 	"github.com/fluxcd/pkg/apis/meta"
-	corev1 "k8s.io/api/core/v1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -77,7 +77,7 @@ type HelmChartStatus struct {
 
 	// Conditions holds the conditions for the HelmChart.
 	// +optional
-	Conditions []meta.Condition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// URL is the download link for the last chart pulled.
 	// +optional
@@ -112,47 +112,34 @@ const (
 func HelmChartProgressing(chart HelmChart) HelmChart {
 	chart.Status.ObservedGeneration = chart.Generation
 	chart.Status.URL = ""
-	chart.Status.Conditions = []meta.Condition{}
-	SetHelmChartCondition(&chart, meta.ReadyCondition, corev1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
+	chart.Status.Conditions = []metav1.Condition{}
+	meta.SetResourceCondition(&chart, meta.ReadyCondition, metav1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
 	return chart
 }
 
-// SetHelmChartCondition sets the given condition with the given status, reason
-// and message on the HelmChart.
-func SetHelmChartCondition(chart *HelmChart, condition string, status corev1.ConditionStatus, reason, message string) {
-	chart.Status.Conditions = meta.FilterOutCondition(chart.Status.Conditions, condition)
-	chart.Status.Conditions = append(chart.Status.Conditions, meta.Condition{
-		Type:               condition,
-		Status:             status,
-		LastTransitionTime: metav1.Now(),
-		Reason:             reason,
-		Message:            message,
-	})
-}
-
 // 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
-	SetHelmChartCondition(&chart, meta.ReadyCondition, corev1.ConditionTrue, reason, message)
+	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 {
-	SetHelmChartCondition(&chart, meta.ReadyCondition, corev1.ConditionFalse, reason, message)
+	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 := meta.GetCondition(chart.Status.Conditions, meta.ReadyCondition); c != nil {
-		if c.Status == corev1.ConditionTrue {
+	if c := apimeta.FindStatusCondition(chart.Status.Conditions, meta.ReadyCondition); c != nil {
+		if c.Status == metav1.ConditionTrue {
 			return c.Message
 		}
 	}
@@ -165,6 +152,11 @@ func (in *HelmChart) GetArtifact() *Artifact {
 	return in.Status.Artifact
 }
 
+// GetStatusConditions returns a pointer to the Status.Conditions slice
+func (in *HelmChart) GetStatusConditions() *[]metav1.Condition {
+	return &in.Status.Conditions
+}
+
 // GetInterval returns the interval at which the source is updated.
 func (in *HelmChart) GetInterval() metav1.Duration {
 	return in.Spec.Interval

api/v1beta1/helmrepository_types.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"github.com/fluxcd/pkg/apis/meta"
 	corev1 "k8s.io/api/core/v1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -63,7 +64,7 @@ type HelmRepositoryStatus struct {
 
 	// Conditions holds the conditions for the HelmRepository.
 	// +optional
-	Conditions []meta.Condition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// URL is the download link for the last index fetched.
 	// +optional
@@ -85,53 +86,40 @@ const (
 )
 
 // HelmRepositoryProgressing resets the conditions of the HelmRepository to
-// meta.Condition of type meta.ReadyCondition with status 'Unknown' and
+// metav1.Condition of type meta.ReadyCondition with status 'Unknown' and
 // meta.ProgressingReason reason and message. It returns the modified
 // HelmRepository.
 func HelmRepositoryProgressing(repository HelmRepository) HelmRepository {
 	repository.Status.ObservedGeneration = repository.Generation
 	repository.Status.URL = ""
-	repository.Status.Conditions = []meta.Condition{}
-	SetHelmRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
+	repository.Status.Conditions = []metav1.Condition{}
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionUnknown, meta.ProgressingReason, "reconciliation in progress")
 	return repository
 }
 
-// SetHelmRepositoryCondition sets the given condition with the given status,
-// reason and message on the HelmRepository.
-func SetHelmRepositoryCondition(repository *HelmRepository, condition string, status corev1.ConditionStatus, reason, message string) {
-	repository.Status.Conditions = meta.FilterOutCondition(repository.Status.Conditions, condition)
-	repository.Status.Conditions = append(repository.Status.Conditions, meta.Condition{
-		Type:               condition,
-		Status:             status,
-		LastTransitionTime: metav1.Now(),
-		Reason:             reason,
-		Message:            message,
-	})
-}
-
 // HelmRepositoryReady sets the given Artifact and URL on the HelmRepository and
 // sets the meta.ReadyCondition to 'True', with the given reason and message. It
 // returns the modified HelmRepository.
 func HelmRepositoryReady(repository HelmRepository, artifact Artifact, url, reason, message string) HelmRepository {
 	repository.Status.Artifact = &artifact
 	repository.Status.URL = url
-	SetHelmRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionTrue, reason, message)
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionTrue, reason, message)
 	return repository
 }
 
 // HelmRepositoryNotReady sets the meta.ReadyCondition on the given
 // HelmRepository to 'False', with the given reason and message. It returns the
 // modified HelmRepository.
 func HelmRepositoryNotReady(repository HelmRepository, reason, message string) HelmRepository {
-	SetHelmRepositoryCondition(&repository, meta.ReadyCondition, corev1.ConditionFalse, reason, message)
+	meta.SetResourceCondition(&repository, meta.ReadyCondition, metav1.ConditionFalse, reason, message)
 	return repository
 }
 
-// HelmRepositoryReadyMessage returns the message of the meta.Condition of type
+// HelmRepositoryReadyMessage returns the message of the metav1.Condition of type
 // meta.ReadyCondition with status 'True' if present, or an empty string.
 func HelmRepositoryReadyMessage(repository HelmRepository) string {
-	if c := meta.GetCondition(repository.Status.Conditions, meta.ReadyCondition); c != nil {
-		if c.Status == corev1.ConditionTrue {
+	if c := apimeta.FindStatusCondition(repository.Status.Conditions, meta.ReadyCondition); c != nil {
+		if c.Status == metav1.ConditionTrue {
 			return c.Message
 		}
 	}
@@ -144,6 +132,11 @@ func (in *HelmRepository) GetArtifact() *Artifact {
 	return in.Status.Artifact
 }
 
+// GetStatusConditions returns a pointer to the Status.Conditions slice
+func (in *HelmRepository) GetStatusConditions() *[]metav1.Condition {
+	return &in.Status.Conditions
+}
+
 // GetInterval returns the interval at which the source is updated.
 func (in *HelmRepository) GetInterval() metav1.Duration {
 	return in.Spec.Interval