Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.

We need to fail the install if any transforms error #212

Merged
knative-prow-robot merged 1 commit into from
Nov 12, 2019
Merged

We need to fail the install if any transforms error #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pkg/reconciler/knativeserving/knativeserving_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func (r *Reconciler) reconcile(ctx context.Context, ks *servingv1alpha1.KnativeS

manifest, err := r.transform(ks)
if err != nil {
ks.Status.MarkInstallFailed(err.Error())
return err
}

Expand Down Expand Up @@ -181,7 +182,6 @@ func (r *Reconciler) install(manifest *mf.Manifest, instance *servingv1alpha1.Kn
// Check for all deployments available
func (r *Reconciler) checkDeployments(manifest *mf.Manifest, instance *servingv1alpha1.KnativeServing) error {
r.Logger.Debug("Checking deployments")
defer r.updateStatus(instance)
Copy link
Copy Markdown

@houshengbo houshengbo Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jcrossley3 Has this line intentionally been removed?

Copy link
Copy Markdown
Contributor Author

@jcrossley3 jcrossley3 Nov 12, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I think it's redundant due to

serving-operator/pkg/reconciler/knativeserving/knativeserving_controller.go

Line 97 in 39757e9

} else if err = r.updateStatus(knativeServing); err != nil {

available := func(d *appsv1.Deployment) bool {
for _, c := range d.Status.Conditions {
if c.Type == appsv1.DeploymentAvailable && c.Status == corev1.ConditionTrue {
Expand Down