addressing nits

Signed-off-by: Jaydip Gabani <gabanijaydip@gmail.com>
open-policy-agent · Aug 7, 2024 · 5b3ffa0 · 5b3ffa0
1 parent 2f0b758
commit 5b3ffa0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controller/constraint/constraint_controller.go b/pkg/controller/constraint/constraint_controller.go
@@ -352,7 +352,7 @@ func (r *ReconcileConstraint) Reconcile(ctx context.Context, request reconcile.R
 				if err != nil {
 					status.Status.Errors = append(status.Status.Errors, constraintstatusv1beta1.Error{Message: err.Error()})
 					if err2 := r.writer.Update(ctx, status); err2 != nil {
-						log.Error(err2, "could not report transform vapbinding error", "vapName", vapBindingName)
+						log.Error(err2, "could not report transform vapbinding error", "vapBindingName", vapBindingName)
 					}
 					return reconcile.Result{}, err
 				}
@@ -361,7 +361,7 @@ func (r *ReconcileConstraint) Reconcile(ctx context.Context, request reconcile.R
 				if err != nil {
 					status.Status.Errors = append(status.Status.Errors, constraintstatusv1beta1.Error{Message: err.Error()})
 					if err2 := r.writer.Update(ctx, status); err2 != nil {
-						log.Error(err2, "could not get VAP object with runtime group version", "vapName", vapBindingName)
+						log.Error(err2, "could not get VAP object with runtime group version", "vapBindingName", vapBindingName)
 					}
 					return reconcile.Result{}, err
 				}
@@ -657,7 +657,7 @@ func IsVapAPIEnabled() (bool, *schema.GroupVersion) {
 		return false, nil
 	}
 
-	groupVersion := schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1"}
+	groupVersion := admissionregistrationv1.SchemeGroupVersion
 	resList, err := clientset.Discovery().ServerResourcesForGroupVersion(groupVersion.String())
 	if err == nil {
 		for i := 0; i < len(resList.APIResources); i++ {
@@ -670,7 +670,7 @@ func IsVapAPIEnabled() (bool, *schema.GroupVersion) {
 		}
 	}
 
-	groupVersion = schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}
+	groupVersion = admissionregistrationv1beta1.SchemeGroupVersion
 	resList, err = clientset.Discovery().ServerResourcesForGroupVersion(groupVersion.String())
 	if err == nil {
 		for i := 0; i < len(resList.APIResources); i++ {
@@ -683,7 +683,7 @@ func IsVapAPIEnabled() (bool, *schema.GroupVersion) {
 		}
 	}
 
-	log.Info("IsVapAPIEnabled", "error", err)
+	log.Error(err, "error checking VAP api availability", "IsVapAPIEnabled", "false")
 	VapAPIEnabled = new(bool)
 	*VapAPIEnabled = false
 	return false, nil

diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go b/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go
@@ -272,7 +272,7 @@ func TestReconcile(t *testing.T) {
 	testutils.StartManager(ctx, t, mgr)
 
 	constraint.VapAPIEnabled = ptr.To[bool](true)
-	constraint.GroupVersion = &schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}
+	constraint.GroupVersion = &admissionregistrationv1beta1.SchemeGroupVersion
 
 	t.Run("CRD Gets Created", func(t *testing.T) {
 		suffix := "CRDGetsCreated"
@@ -622,7 +622,7 @@ func TestReconcile(t *testing.T) {
 		suffix := "VapShouldBeCreatedV1"
 
 		logger.Info("Running test: Vap should be created with v1")
-		constraint.GroupVersion = &schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1"}
+		constraint.GroupVersion = &admissionregistrationv1.SchemeGroupVersion
 		constraintTemplate := makeReconcileConstraintTemplateForVap(suffix, ptr.To[bool](true))
 		t.Cleanup(testutils.DeleteObjectAndConfirm(ctx, t, c, expectedCRD(suffix)))
 		testutils.CreateThenCleanup(ctx, t, c, constraintTemplate)
@@ -647,7 +647,7 @@ func TestReconcile(t *testing.T) {
 		suffix := "VapBindingShouldBeCreatedV1"
 		logger.Info("Running test: VapBinding should be created with v1")
 		constraint.DefaultGenerateVAPB = ptr.To[bool](true)
-		constraint.GroupVersion = &schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1"}
+		constraint.GroupVersion = &admissionregistrationv1.SchemeGroupVersion
 		constraintTemplate := makeReconcileConstraintTemplateForVap(suffix, ptr.To[bool](false))
 		cstr := newDenyAllCstr(suffix)
 		t.Cleanup(testutils.DeleteObjectAndConfirm(ctx, t, c, expectedCRD(suffix)))