actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-20 14:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #2859 from SomtochiAma/oci-success-msg

Browse source 
Return different success message for `oci` type - `reconcile_source_helm`
This commit is contained in:
Stefan Prodan 2022-06-22 18:37:11 +03:00 committed by GitHub
commit 12504c76d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/flux/reconcile_source_helm.go
View file

@ -21,6 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/fluxcd/pkg/apis/meta"
"github.com/fluxcd/pkg/runtime/conditions"
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
) )
@ -46,5 +48,15 @@ func (obj helmRepositoryAdapter) lastHandledReconcileRequest() string {
} }
func (obj helmRepositoryAdapter) successMessage() string { func (obj helmRepositoryAdapter) successMessage() string {
// HelmRepository of type OCI don't set an Artifact
if obj.Spec.Type == sourcev1.HelmRepositoryTypeOCI {
readyCondition := conditions.Get(obj.HelmRepository, meta.ReadyCondition)
// This shouldn't happen, successMessage shouldn't be called if
// object isn't ready
if readyCondition == nil {
return ""
}
return readyCondition.Message
}
return fmt.Sprintf("fetched revision %s", obj.Status.Artifact.Revision) return fmt.Sprintf("fetched revision %s", obj.Status.Artifact.Revision)
} }