Skip to content
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

Conversion errors should be fatal #197

Merged
merged 1 commit into from
Jul 30, 2019
Merged

Conversion errors should be fatal #197

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
16 changes: 8 additions & 8 deletions pkg/controller/constrainttemplate/constrainttemplate_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (r *ReconcileConstraintTemplate) Reconcile(request reconcile.Request) (reco
versionless := &templates.ConstraintTemplate{}
if err := r.scheme.Convert(instance, versionless, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
crd, err := r.opa.CreateCRD(context.Background(), versionless)
if err != nil {
Expand Down Expand Up @@ -182,7 +182,7 @@ func (r *ReconcileConstraintTemplate) Reconcile(request reconcile.Request) (reco
unversionedCRD := &apiextensions.CustomResourceDefinition{}
if err := r.scheme.Convert(found, unversionedCRD, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
return r.handleUpdate(instance, crd, unversionedCRD)
}
Expand All @@ -208,7 +208,7 @@ func (r *ReconcileConstraintTemplate) handleCreate(
versionless := &templates.ConstraintTemplate{}
if err := r.scheme.Convert(instance, versionless, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if _, err := r.opa.AddTemplate(context.Background(), versionless); err != nil {
updateErr := &v1beta1.CreateCRDError{Code: "update_error", Message: fmt.Sprintf("Could not update CRD: %s", err)}
Expand All @@ -229,7 +229,7 @@ func (r *ReconcileConstraintTemplate) handleCreate(
crdv1beta1 := &apiextensionsv1beta1.CustomResourceDefinition{}
if err := r.scheme.Convert(crd, crdv1beta1, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if err := r.Create(context.TODO(), crdv1beta1); err != nil {
status := util.GetCTHAStatus(instance)
Expand Down Expand Up @@ -262,7 +262,7 @@ func (r *ReconcileConstraintTemplate) handleUpdate(
versionless := &templates.ConstraintTemplate{}
if err := r.scheme.Convert(instance, versionless, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if _, err := r.opa.AddTemplate(context.Background(), versionless); err != nil {
updateErr := &v1beta1.CreateCRDError{Code: "update_error", Message: fmt.Sprintf("Could not update CRD: %s", err)}
Expand All @@ -285,7 +285,7 @@ func (r *ReconcileConstraintTemplate) handleUpdate(
crdv1beta1 := &apiextensionsv1beta1.CustomResourceDefinition{}
if err := r.scheme.Convert(found, crdv1beta1, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if err := r.Update(context.Background(), crdv1beta1); err != nil {
return reconcile.Result{}, err
Expand All @@ -308,7 +308,7 @@ func (r *ReconcileConstraintTemplate) handleDelete(
crdv1beta1 := &apiextensionsv1beta1.CustomResourceDefinition{}
if err := r.scheme.Convert(crd, crdv1beta1, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if err := r.Delete(context.Background(), crdv1beta1); err != nil && !errors.IsNotFound(err) {
return reconcile.Result{}, err
Expand All @@ -332,7 +332,7 @@ func (r *ReconcileConstraintTemplate) handleDelete(
versionless := &templates.ConstraintTemplate{}
if err := r.scheme.Convert(instance, versionless, nil); err != nil {
log.Error(err, "conversion error")
return reconcile.Result{Requeue: true}, nil
return reconcile.Result{}, err
}
if _, err := r.opa.RemoveTemplate(context.Background(), versionless); err != nil {
return reconcile.Result{}, err
Expand Down