Fixed linting

stakater · Feb 26, 2025 · f641d6f · f641d6f
1 parent 6d75383
commit f641d6f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/internal/controller/keycloak_controller.go b/internal/controller/keycloak_controller.go
@@ -19,6 +19,7 @@ package controller
 import (
 	"context"
 	"fmt"
+
 	v12 "github.com/openshift/api/route/v1"
 	ssov1alpha1 "github.com/stakater/rhbk-operator/api/v1alpha1"
 	"github.com/stakater/rhbk-operator/internal/resources"

diff --git a/internal/controller/keycloakimport_controller.go b/internal/controller/keycloakimport_controller.go
@@ -19,6 +19,7 @@ package controller
 import (
 	"context"
 	"fmt"
+
 	"github.com/go-logr/logr"
 	ssov1alpha1 "github.com/stakater/rhbk-operator/api/v1alpha1"
 	"github.com/stakater/rhbk-operator/internal/constants"
@@ -131,8 +132,7 @@ func (r *KeycloakImportReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	// If no job found create job and wait for next reconcile when job is completed
 	if found == nil {
-		importJob := &v14.Job{}
-		importJob, err = resources.Build(cr, statefulSet, importSecret.Resource.ResourceVersion, r.Scheme)
+		importJob, err := resources.Build(cr, statefulSet, importSecret.Resource.ResourceVersion, r.Scheme)
 		if err != nil {
 			return r.HandleError(ctx, cr, err, "Failed to build import job")
 		}

diff --git a/internal/resources/realm_import_job.go b/internal/resources/realm_import_job.go
@@ -2,13 +2,13 @@ package resources
 
 import (
 	"fmt"
+
 	"github.com/stakater/rhbk-operator/api/v1alpha1"
 	"github.com/stakater/rhbk-operator/internal/constants"
 	v1 "k8s.io/api/apps/v1"
 	v12 "k8s.io/api/batch/v1"
 	v14 "k8s.io/api/core/v1"
 	v13 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
@@ -25,13 +25,6 @@ func GetRealmMountPath(cr *v1alpha1.KeycloakImport) string {
 	return fmt.Sprintf("/mnt/realm-import/%s-realm.json", cr.Name)
 }
 
-func GetImportJobSelectorLabel(importCrName string, secretRevision string) labels.Selector {
-	return labels.SelectorFromSet(map[string]string{
-		constants.RHBKRealmImportLabel:         importCrName,
-		constants.RHBKRealmImportRevisionLabel: secretRevision,
-	})
-}
-
 func Build(cr *v1alpha1.KeycloakImport, sts *v1.StatefulSet, revision string, scheme *runtime.Scheme) (*v12.Job, error) {
 	template := sts.Spec.Template.DeepCopy()
 	template.Labels["app"] = "realm-import-job"

diff --git a/internal/resources/realm_import_secret.go b/internal/resources/realm_import_secret.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"strconv"
+	"text/template"
+
 	"github.com/stakater/rhbk-operator/internal/constants"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strconv"
-	"text/template"
 
 	"github.com/stakater/rhbk-operator/api/v1alpha1"
 	v1 "k8s.io/api/core/v1"

diff --git a/internal/resources/utils.go b/internal/resources/utils.go
@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"hash/fnv"
+	"strconv"
+
 	v12 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"strconv"
 
 	"github.com/stakater/rhbk-operator/internal/constants"
 	v1 "k8s.io/api/batch/v1"