Fix linter issues

Signed-off-by: btofel <[email protected]>
Signed-off-by: Brett Tofel <[email protected]>

Author: bentito

pkg/controller/registry/reconciler/configmap.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 
-	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	hashutil "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/hash"
 	"github.com/pkg/errors"
@@ -111,7 +110,7 @@ func (s *configMapCatalogSourceDecorator) Service() (*corev1.Service, error) {
 	return svc, nil
 }
 
-func (s *configMapCatalogSourceDecorator) getNamespaceSecurityContextConfig() (operatorsv1alpha1.SecurityConfig, error) {
+func (s *configMapCatalogSourceDecorator) getNamespaceSecurityContextConfig() (v1alpha1.SecurityConfig, error) {
 	namespace := s.GetNamespace()
 	if config, ok := s.Reconciler.namespacePSAConfigCache[namespace]; ok {
 		return config, nil
@@ -126,10 +125,10 @@ func (s *configMapCatalogSourceDecorator) getNamespaceSecurityContextConfig() (o
 	// 'pod-security.kubernetes.io/enforce' is the label used for enforcing namespace level security,
 	// and 'restricted' is the value indicating a restricted security policy.
 	if val, exists := ns.Labels["pod-security.kubernetes.io/enforce"]; exists && val == "restricted" {
-		return operatorsv1alpha1.Restricted, nil
+		return v1alpha1.Restricted, nil
 	}
 
-	return operatorsv1alpha1.Legacy, nil
+	return v1alpha1.Legacy, nil
 }
 func (s *configMapCatalogSourceDecorator) Pod(image string) (*corev1.Pod, error) {
 	securityContextConfig, err := s.getNamespaceSecurityContextConfig()
@@ -214,7 +213,7 @@ type ConfigMapRegistryReconciler struct {
 	OpClient                operatorclient.ClientInterface
 	Image                   string
 	createPodAsUser         int64
-	namespacePSAConfigCache map[string]operatorsv1alpha1.SecurityConfig
+	namespacePSAConfigCache map[string]v1alpha1.SecurityConfig
 }
 
 var _ RegistryEnsurer = &ConfigMapRegistryReconciler{}
@@ -302,7 +301,7 @@ func (c *ConfigMapRegistryReconciler) currentPodsWithCorrectResourceVersion(sour
 // EnsureRegistryServer ensures that all components of registry server are up to date.
 func (c *ConfigMapRegistryReconciler) EnsureRegistryServer(logger *logrus.Entry, catalogSource *v1alpha1.CatalogSource) error {
 	if c.namespacePSAConfigCache == nil {
-		c.namespacePSAConfigCache = make(map[string]operatorsv1alpha1.SecurityConfig)
+		c.namespacePSAConfigCache = make(map[string]v1alpha1.SecurityConfig)
 	}
 	source := configMapCatalogSourceDecorator{catalogSource, c, c.createPodAsUser}
 

pkg/controller/registry/reconciler/grpc.go

@@ -12,7 +12,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 
-	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	controllerclient "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/controller-runtime/client"
 	hashutil "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/hash"
@@ -72,7 +71,7 @@ func (s *grpcCatalogSourceDecorator) Labels() map[string]string {
 	}
 }
 
-func (s *grpcCatalogSourceDecorator) getNamespaceSecurityContextConfig() (operatorsv1alpha1.SecurityConfig, error) {
+func (s *grpcCatalogSourceDecorator) getNamespaceSecurityContextConfig() (v1alpha1.SecurityConfig, error) {
 	namespace := s.GetNamespace()
 	if config, ok := s.Reconciler.namespacePSAConfigCache[namespace]; ok {
 		return config, nil
@@ -87,10 +86,10 @@ func (s *grpcCatalogSourceDecorator) getNamespaceSecurityContextConfig() (operat
 	// 'pod-security.kubernetes.io/enforce' is the label used for enforcing namespace level security,
 	// and 'restricted' is the value indicating a restricted security policy.
 	if val, exists := ns.Labels["pod-security.kubernetes.io/enforce"]; exists && val == "restricted" {
-		return operatorsv1alpha1.Restricted, nil
+		return v1alpha1.Restricted, nil
 	}
 
-	return operatorsv1alpha1.Legacy, nil
+	return v1alpha1.Legacy, nil
 }
 
 func (s *grpcCatalogSourceDecorator) Annotations() map[string]string {
@@ -179,7 +178,7 @@ type GrpcRegistryReconciler struct {
 	createPodAsUser         int64
 	opmImage                string
 	utilImage               string
-	namespacePSAConfigCache map[string]operatorsv1alpha1.SecurityConfig
+	namespacePSAConfigCache map[string]v1alpha1.SecurityConfig
 }
 
 var _ RegistryReconciler = &GrpcRegistryReconciler{}
@@ -280,7 +279,7 @@ func correctImages(source grpcCatalogSourceDecorator, pod *corev1.Pod) bool {
 // EnsureRegistryServer ensures that all components of registry server are up to date.
 func (c *GrpcRegistryReconciler) EnsureRegistryServer(logger *logrus.Entry, catalogSource *v1alpha1.CatalogSource) error {
 	if c.namespacePSAConfigCache == nil {
-		c.namespacePSAConfigCache = make(map[string]operatorsv1alpha1.SecurityConfig)
+		c.namespacePSAConfigCache = make(map[string]v1alpha1.SecurityConfig)
 	}
 	source := grpcCatalogSourceDecorator{CatalogSource: catalogSource, createPodAsUser: c.createPodAsUser, opmImage: c.opmImage, utilImage: c.utilImage}
 

pkg/controller/registry/reconciler/reconciler.go

@@ -207,7 +207,7 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name, opmImg, utilImage, img s
 	}
 
 	// Define default security context config
-	securityContextConfig := operatorsv1alpha1.Legacy
+	var securityContextConfig operatorsv1alpha1.SecurityConfig
 
 	// Determine the security context configuration based on GrpcPodConfig
 	if source.Spec.GrpcPodConfig != nil {