Merge pull request #244 from sebrandon1/import_consistency

refactor: Improves naming consistency across all go imports

Author: openshift-merge-bot[bot]

pkg/controller/deployment/credentials_request.go

@@ -12,7 +12,7 @@ import (
 	"github.com/openshift/cert-manager-operator/pkg/operator/operatorclient"
 	configinformersv1 "github.com/openshift/client-go/config/informers/externalversions/config/v1"
 
-	v1 "github.com/openshift/api/operator/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 )
 
 const (
@@ -29,16 +29,16 @@ const (
 	cloudCredentialsVolumeName = "cloud-credentials"
 )
 
-func withCloudCredentials(secretsInformer coreinformersv1.SecretInformer, infraInformer configinformersv1.InfrastructureInformer, deploymentName, secretName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withCloudCredentials(secretsInformer coreinformersv1.SecretInformer, infraInformer configinformersv1.InfrastructureInformer, deploymentName, secretName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	// cloud credentials is only required for the controller deployment,
 	// other deployments should be left untouched
 	if deploymentName != certmanagerControllerDeployment {
-		return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+		return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 			return nil
 		}
 	}
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		if len(secretName) == 0 {
 			return nil
 		}

pkg/controller/deployment/deployment_log_level.go

@@ -3,19 +3,19 @@ package deployment
 import (
 	appsv1 "k8s.io/api/apps/v1"
 
-	v1 "github.com/openshift/api/operator/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 )
 
-var logLevels = map[v1.LogLevel]string{
-	v1.Normal:   "--v=2",
-	v1.Debug:    "--v=4",
-	v1.Trace:    "--v=6",
-	v1.TraceAll: "--v=8",
+var logLevels = map[operatorv1.LogLevel]string{
+	operatorv1.Normal:   "--v=2",
+	operatorv1.Debug:    "--v=4",
+	operatorv1.Trace:    "--v=6",
+	operatorv1.TraceAll: "--v=8",
 }
 
 // withLogLevel sets the values of verbosity --v arg using
 // logLevel specified in spec
-func withLogLevel(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withLogLevel(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	verbosityArg := logLevels[operatorSpec.LogLevel]
 	if verbosityArg == "" {
 		return nil

pkg/controller/deployment/deployment_overrides.go

@@ -11,7 +11,7 @@ import (
 	coreinformersv1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/utils/pointer"
 
-	v1 "github.com/openshift/api/operator/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 	"github.com/operator-framework/operator-lib/proxy"
 
 	"github.com/openshift/cert-manager-operator/api/operator/v1alpha1"
@@ -69,7 +69,7 @@ type overrideSchedulingFunc func(certmanagerinformer.CertManagerInformer, string
 
 // withOperandImageOverrideHook overrides the deployment image with
 // the operand images provided to the operator.
-func withOperandImageOverrideHook(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withOperandImageOverrideHook(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	for index := range deployment.Spec.Template.Spec.Containers {
 		deployment.Spec.Template.Spec.Containers[index].Image = certManagerImage(deployment.Spec.Template.Spec.Containers[index].Image)
 	}
@@ -85,8 +85,8 @@ func withOperandImageOverrideHook(operatorSpec *v1.OperatorSpec, deployment *app
 
 // withContainerArgsOverrideHook overrides the container args with those provided by
 // the overrideArgsFunc function.
-func withContainerArgsOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideArgsFunc) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerArgsOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideArgsFunc) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		overrideArgs, err := fn(certmanagerinformer, deploymentName)
 		if err != nil {
 			return err
@@ -103,8 +103,8 @@ func withContainerArgsOverrideHook(certmanagerinformer certmanagerinformer.CertM
 
 // withContainerEnvOverrideHook verrides the container env with those provided by
 // the overrideEnvFunc function.
-func withContainerEnvOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideEnvFunc) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerEnvOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideEnvFunc) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		overrideEnv, err := fn(certmanagerinformer, deploymentName)
 		if err != nil {
 			return err
@@ -121,8 +121,8 @@ func withContainerEnvOverrideHook(certmanagerinformer certmanagerinformer.CertMa
 
 // withContainerResourcesOverrideHook overrides the container resources with those provided by
 // the overrideResourcesFunc function.
-func withContainerResourcesOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideResourcesFunc) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerResourcesOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideResourcesFunc) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		overrideResources, err := fn(certmanagerinformer, deploymentName)
 		if err != nil {
 			return err
@@ -139,8 +139,8 @@ func withContainerResourcesOverrideHook(certmanagerinformer certmanagerinformer.
 
 // withPodSchedulingOverrideHook overrides the pod scheduling with those provided by
 // the overrideSchedulingFunc function.
-func withPodSchedulingOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideSchedulingFunc) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withPodSchedulingOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideSchedulingFunc) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		overrideScheduling, err := fn(certmanagerinformer, deploymentName)
 		if err != nil {
 			return err
@@ -160,15 +160,15 @@ func withPodSchedulingOverrideHook(certmanagerinformer certmanagerinformer.CertM
 
 // withProxyEnv patches the operand deployment if operator
 // has proxy variables set. Sets HTTPS_PROXY, HTTP_PROXY and NO_PROXY.
-func withProxyEnv(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withProxyEnv(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	deployment.Spec.Template.Spec.Containers[0].Env = mergeContainerEnvs(deployment.Spec.Template.Spec.Containers[0].Env, proxy.ReadProxyVarsFromEnv())
 	return nil
 }
 
 // withCAConfigMap patches the operand deployment to include the custom
 // ca bundle as a volume. This is set when a trusted ca configmap is provided.
-func withCAConfigMap(configmapinformer coreinformersv1.ConfigMapInformer, deployment *appsv1.Deployment, trustedCAConfigmapName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withCAConfigMap(configmapinformer coreinformersv1.ConfigMapInformer, deployment *appsv1.Deployment, trustedCAConfigmapName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
 		if len(trustedCAConfigmapName) == 0 {
 			return nil
@@ -205,8 +205,8 @@ func withCAConfigMap(configmapinformer coreinformersv1.ConfigMapInformer, deploy
 }
 
 // withPodLabels patches the operand deployment to include custom pod labels
-func withPodLabelsOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideLabelsFunc) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withPodLabelsOverrideHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string, fn overrideLabelsFunc) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		overrideLabels, err := fn(certmanagerinformer, deploymentName)
 		if err != nil {
 			return err
@@ -220,7 +220,7 @@ func withPodLabelsOverrideHook(certmanagerinformer certmanagerinformer.CertManag
 	}
 }
 
-func withSABoundToken(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withSABoundToken(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	volume := corev1.Volume{
 		Name: boundSATokenVolumeName,
 		VolumeSource: corev1.VolumeSource{

pkg/controller/deployment/deployment_overrides_validation.go

@@ -13,15 +13,15 @@ import (
 	corevalidation "k8s.io/kubernetes/pkg/apis/core/validation"
 	"k8s.io/utils/strings/slices"
 
-	v1 "github.com/openshift/api/operator/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 
 	"github.com/openshift/cert-manager-operator/api/operator/v1alpha1"
 	certmanagerinformer "github.com/openshift/cert-manager-operator/pkg/operator/informers/externalversions/operator/v1alpha1"
 )
 
 // withContainerArgsValidateHook validates the container args with those that
 // are supported by the operator.
-func withContainerArgsValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerArgsValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
 	supportedCertManagerArgs := []string{
 		// A list of comma separated dns server endpoints used for ACME HTTP01 check requests.
@@ -73,7 +73,7 @@ func withContainerArgsValidateHook(certmanagerinformer certmanagerinformer.CertM
 		return nil
 	}
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		certmanager, err := certmanagerinformer.Lister().Get("cluster")
 		if err != nil {
 			return fmt.Errorf("failed to get certmanager %q due to %v", "cluster", err)
@@ -106,7 +106,7 @@ func withContainerArgsValidateHook(certmanagerinformer certmanagerinformer.CertM
 
 // withContainerEnvValidateHook validates the container env with those that
 // are supported by the operator.
-func withContainerEnvValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerEnvValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
 	supportedCertManagerEnv := []string{
 		"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY",
@@ -123,7 +123,7 @@ func withContainerEnvValidateHook(certmanagerinformer certmanagerinformer.CertMa
 		return nil
 	}
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		certmanager, err := certmanagerinformer.Lister().Get("cluster")
 		if err != nil {
 			return fmt.Errorf("failed to get certmanager %q due to %v", "cluster", err)
@@ -156,7 +156,7 @@ func withContainerEnvValidateHook(certmanagerinformer certmanagerinformer.CertMa
 
 // withPodLabelsValidateHook validates the pod labels from specific deployment config
 // with those that are supported by the operator.
-func withPodLabelsValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withPodLabelsValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
 	supportedCertManagerLabelKeys := []string{
 		"azure.workload.identity/use",
@@ -173,7 +173,7 @@ func withPodLabelsValidateHook(certmanagerinformer certmanagerinformer.CertManag
 		return nil
 	}
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		certmanager, err := certmanagerinformer.Lister().Get("cluster")
 		if err != nil {
 			return fmt.Errorf("failed to get certmanager %q due to %v", "cluster", err)
@@ -202,7 +202,7 @@ func withPodLabelsValidateHook(certmanagerinformer certmanagerinformer.CertManag
 
 // withContainerResourcesValidateHook validates the container resources with those that
 // are supported by the operator.
-func withContainerResourcesValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withContainerResourcesValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
 	supportedCertManagerResourceNames := []string{
 		string(corev1.ResourceCPU), string(corev1.ResourceMemory),
@@ -214,7 +214,7 @@ func withContainerResourcesValidateHook(certmanagerinformer certmanagerinformer.
 		string(corev1.ResourceCPU), string(corev1.ResourceMemory),
 	}
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		certmanager, err := certmanagerinformer.Lister().Get("cluster")
 		if err != nil {
 			return fmt.Errorf("failed to get certmanager %q due to %v", "cluster", err)
@@ -258,9 +258,9 @@ func validateResources(resources v1alpha1.CertManagerResourceRequirements, suppo
 }
 
 // withPodSchedulingValidateHook validates the overrides scheduling field for each operand.
-func withPodSchedulingValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withPodSchedulingValidateHook(certmanagerinformer certmanagerinformer.CertManagerInformer, deploymentName string) func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 
-	return func(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+	return func(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 		certmanager, err := certmanagerinformer.Lister().Get("cluster")
 		if err != nil {
 			return fmt.Errorf("failed to get certmanager %q due to %v", "cluster", err)

pkg/controller/deployment/deployment_unsupported_overrides.go

@@ -5,7 +5,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 
-	v1 "github.com/openshift/api/operator/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 
 	"github.com/openshift/cert-manager-operator/api/operator/v1alpha1"
 )
@@ -36,7 +36,7 @@ func unsupportedConfigOverrides(deployment *appsv1.Deployment, unsupportedConfig
 
 // withUnsupportedArgsOverrideHook overrides the container args with those provided by
 // UnsupportedConfigOverrides in the operatorSpec.
-func withUnsupportedArgsOverrideHook(operatorSpec *v1.OperatorSpec, deployment *appsv1.Deployment) error {
+func withUnsupportedArgsOverrideHook(operatorSpec *operatorv1.OperatorSpec, deployment *appsv1.Deployment) error {
 	cfg := &v1alpha1.UnsupportedConfigOverrides{}
 	if len(operatorSpec.UnsupportedConfigOverrides.Raw) != 0 {
 		err := json.Unmarshal(operatorSpec.UnsupportedConfigOverrides.Raw, cfg)