adding warning for CT when VAP API is not enabled and generation is on

Signed-off-by: Jaydip Gabani <gabanijaydip@gmail.com>
open-policy-agent · Aug 9, 2024 · cc13d9a · cc13d9a
1 parent 59cebbf
commit cc13d9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pkg/controller/constraint/constraint_controller.go b/pkg/controller/constraint/constraint_controller.go
@@ -323,8 +323,12 @@ func (r *ReconcileConstraint) Reconcile(ctx context.Context, request reconcile.R
 			}
 			if generateVAPB {
 				if !isAPIEnabled {
-					r.log.V(1).Info("Warning: VAP API is not enabled, cannot create VAPBinding")
+					r.log.V(1).Info("Warning: ValidatingAdmissionPolicy api is not enabled, cannot create ValidatingAdmissionPolicyBinding")
 					generateVAPB = false
+					status.Status.Errors = append(status.Status.Errors, constraintstatusv1beta1.Error{Message: "Warning: ValidatingAdmissionPolicy api is not enabled, cannot create ValidatingAdmissionPolicyBinding"})
+					if err2 := r.writer.Update(ctx, status); err2 != nil {
+						log.Error(err2, "could not update constraint status error when VAP API is not enabled")
+					}
 				} else {
 					unversionedCT := &templates.ConstraintTemplate{}
 					if err := r.scheme.Convert(ct, unversionedCT, nil); err != nil {
@@ -345,6 +349,10 @@ func (r *ReconcileConstraint) Reconcile(ctx context.Context, request reconcile.R
 					if !hasVAP {
 						r.log.V(1).Info("Warning: Conditions are not satisfied to generate ValidatingAdmissionPolicy and ValidatingAdmissionPolicyBinding")
 						generateVAPB = false
+						status.Status.Errors = append(status.Status.Errors, constraintstatusv1beta1.Error{Message: "Warning: Conditions are not satisfied to generate ValidatingAdmissionPolicy and ValidatingAdmissionPolicyBinding"})
+						if err2 := r.writer.Update(ctx, status); err2 != nil {
+							log.Error(err2, "could not update constraint status error when conditions are not satisfied to generate VAP")
+						}
 					}
 				}
 			}

diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller.go b/pkg/controller/constrainttemplate/constrainttemplate_controller.go
@@ -484,7 +484,11 @@ func (r *ReconcileConstraintTemplate) handleUpdate(
 	logger.Info("isVAPapiEnabled", "isVAPapiEnabled", isVAPapiEnabled)
 	logger.Info("groupVersion", "groupVersion", groupVersion)
 	if generateVap && (!isVAPapiEnabled || groupVersion == nil) {
-		logger.V(1).Info("Warning: VAP API is not enabled, VAP will not be generated for constraint template", "name", ct.GetName())
+		logger.V(1).Info("Warning: ValidatingAdmissionPolicy API is not enabled, ValidatingAdmissionPolicy resource cannot be generated for ConstraintTemplate", "name", ct.GetName())
+		createErr := &v1beta1.CreateCRDError{Code: ErrCreateCode, Message: "ValidatingAdmissionPolicy API is not enabled, ValidatingAdmissionPolicy resource cannot be generated for ConstraintTemplate"}
+		status.Status.Errors = append(status.Status.Errors, createErr)
+		err := r.reportErrorOnCTStatus(ctx, ErrCreateCode, "Warning: ValidatingAdmissionPolicy resource cannot be generated for ConstraintTemplate", status, errors.New("ValidatingAdmissionPolicy API is not enabled"))
+		return reconcile.Result{}, err
 	}
 	// generating vap resources
 	if generateVap && isVAPapiEnabled && groupVersion != nil {