diff --git a/api/v1alpha1/argocd_conversion.go b/api/v1alpha1/argocd_conversion.go index 25e9d6057..104b3f8b4 100644 --- a/api/v1alpha1/argocd_conversion.go +++ b/api/v1alpha1/argocd_conversion.go @@ -3,9 +3,10 @@ package v1alpha1 import ( "reflect" - v1beta1 "github.com/argoproj-labs/argocd-operator/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/conversion" + + "github.com/argoproj-labs/argocd-operator/api/v1beta1" ) var conversionLogger = ctrl.Log.WithName("conversion-webhook") diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 617fe8634..13b9c632a 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -2,10 +2,5 @@ resources: #- manifests.yaml - service.yaml -patches: -#- non-olm-patches/cainjection_in_argocds.yaml -#- non-olm-patches/cainjection_in_service.yaml -#- non-olm-patches/vol_in_deployment.yaml - configurations: - kustomizeconfig.yaml diff --git a/controllers/argocd/role_test.go b/controllers/argocd/role_test.go index cf68dbe68..0129048f6 100644 --- a/controllers/argocd/role_test.go +++ b/controllers/argocd/role_test.go @@ -25,7 +25,7 @@ func TestReconcileArgoCD_reconcileRole(t *testing.T) { assert.NoError(t, createNamespace(r, a.Namespace, "")) assert.NoError(t, createNamespace(r, "newNamespaceTest", a.Namespace)) - workloadIdentifier := common.ArgoCDApplicationControllerComponent + workloadIdentifier := common.ArgoCDApplicationControllerComponent expectedRules := policyRuleForApplicationController() _, err := r.reconcileRole(workloadIdentifier, expectedRules, a) assert.NoError(t, err) @@ -231,7 +231,7 @@ func TestReconcileRoles_ManagedTerminatingNamespace(t *testing.T) { // Create a managed namespace assert.NoError(t, createNamespace(r, "managedNS", a.Namespace)) - workloadIdentifier := common.ArgoCDApplicationControllerComponent + workloadIdentifier := common.ArgoCDApplicationControllerComponent expectedRules := policyRuleForApplicationController() _, err := r.reconcileRole(workloadIdentifier, expectedRules, a) assert.NoError(t, err)