Skip to content

Use same logger during reconcile operations #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiddeco merged 2 commits into from
Apr 14, 2020
Merged

Use same logger during reconcile operations #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0f4908
Use same logger during reconcile operations
hiddeco Apr 14, 2020
dd68887
Get message from truely ready conditions only
hiddeco Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1alpha1/helmchart_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func HelmChartNotReady(chart HelmChart, reason, message string) HelmChart {

func HelmChartReadyMessage(chart HelmChart) string {
for _, condition := range chart.Status.Conditions {
if condition.Type == ReadyCondition {
if condition.Type == ReadyCondition && condition.Status == corev1.ConditionTrue {
return condition.Message
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/helmrepository_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func HelmRepositoryNotReady(repository HelmRepository, reason, message string) H

func HelmRepositoryReadyMessage(repository HelmRepository) string {
for _, condition := range repository.Status.Conditions {
if condition.Type == ReadyCondition {
if condition.Type == ReadyCondition && condition.Status == corev1.ConditionTrue {
return condition.Message
}
}
Expand Down
13 changes: 7 additions & 6 deletions controllers/gitrepository_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
}

// try to remove old artifacts
r.gc(repo)
if err := r.gc(repo); err != nil {
log.Error(err, "artifacts GC failed")
}

// try git clone
syncedRepo, err := r.sync(ctx, *repo.DeepCopy())
if err != nil {
log.Info("Git repository sync failed", "error", err.Error())
log.Error(err, "Git repository sync failed")
}

// update status
Expand Down Expand Up @@ -322,10 +324,9 @@ func (r *GitRepositoryReconciler) shouldResetStatus(repository sourcev1.GitRepos
}
}

func (r *GitRepositoryReconciler) gc(repository sourcev1.GitRepository) {
func (r *GitRepositoryReconciler) gc(repository sourcev1.GitRepository) error {
if repository.Status.Artifact != nil {
if err := r.Storage.RemoveAllButCurrent(*repository.Status.Artifact); err != nil {
r.Log.Info("Artifacts GC failed", "error", err)
}
return r.Storage.RemoveAllButCurrent(*repository.Status.Artifact)
}
return nil
}
31 changes: 16 additions & 15 deletions controllers/helmchart_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
}

// try to remove old artifacts
r.gc(chart)
if err := r.gc(chart); err != nil {
log.Error(err, "artifacts GC failed")
}

// get referenced chart repository
repository, err := r.chartRepository(ctx, chart)
Expand All @@ -87,12 +89,14 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {

// set ownership reference so chart is garbage collected on
// repository removal
r.setOwnerRef(ctx, &chart, repository)
if err := r.setOwnerRef(ctx, &chart, repository); err != nil {
log.Error(err, "failed to set owner reference")
}

// try to pull chart
pulledChart, err := r.sync(repository, *chart.DeepCopy())
if err != nil {
log.Info("Helm chart sync failed", "error", err.Error())
log.Error(err, "Helm chart sync failed")
}

// update status
Expand Down Expand Up @@ -278,21 +282,18 @@ func (r *HelmChartReconciler) shouldResetStatus(chart sourcev1.HelmChart) (bool,
}
}

func (r *HelmChartReconciler) gc(chart sourcev1.HelmChart) {
func (r *HelmChartReconciler) gc(chart sourcev1.HelmChart) error {
if chart.Status.Artifact != nil {
if err := r.Storage.RemoveAllButCurrent(*chart.Status.Artifact); err != nil {
r.Log.Info("Artifacts GC failed", "error", err)
}
return r.Storage.RemoveAllButCurrent(*chart.Status.Artifact)
}
return nil
}

func (r *HelmChartReconciler) setOwnerRef(ctx context.Context, chart *sourcev1.HelmChart, repository sourcev1.HelmRepository) {
if metav1.IsControlledBy(chart.GetObjectMeta(), repository.GetObjectMeta()) {
return
}
chart.SetOwnerReferences(append(chart.GetOwnerReferences(),
*metav1.NewControllerRef(repository.GetObjectMeta(), repository.GroupVersionKind())))
if err := r.Update(ctx, chart); err != nil {
r.Log.Error(err, fmt.Sprintf("failed to set owner reference to HelmRepository '%s'", repository.Name))
func (r *HelmChartReconciler) setOwnerRef(ctx context.Context, chart *sourcev1.HelmChart, repository sourcev1.HelmRepository) error {
if !metav1.IsControlledBy(chart.GetObjectMeta(), repository.GetObjectMeta()) {
chart.SetOwnerReferences(append(chart.GetOwnerReferences(),
*metav1.NewControllerRef(repository.GetObjectMeta(), repository.GroupVersionKind())))
return r.Update(ctx, chart)
}
return nil
}
13 changes: 7 additions & 6 deletions controllers/helmrepository_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,14 @@ func (r *HelmRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
}

// try to remove old artifacts
r.gc(repository)
if err := r.gc(repository); err != nil {
log.Error(err, "artifacts GC failed")
}

// try to download index
syncedRepo, err := r.sync(*repository.DeepCopy())
if err != nil {
log.Info("Helm repository sync failed", "error", err.Error())
log.Error(err, "Helm repository sync failed")
}

// update status
Expand Down Expand Up @@ -221,10 +223,9 @@ func (r *HelmRepositoryReconciler) shouldResetStatus(repository sourcev1.HelmRep
}
}

func (r *HelmRepositoryReconciler) gc(repository sourcev1.HelmRepository) {
func (r *HelmRepositoryReconciler) gc(repository sourcev1.HelmRepository) error {
if repository.Status.Artifact != nil {
if err := r.Storage.RemoveAllButCurrent(*repository.Status.Artifact); err != nil {
r.Log.Info("Artifacts GC failed", "error", err)
}
return r.Storage.RemoveAllButCurrent(*repository.Status.Artifact)
}
return nil
}