Skip to content

fix: Rename inner module from argoproj-labs to redhat-developer #1334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 6 commits into from
Oct 19, 2026
Merged

fix: Rename inner module from argoproj-labs to redhat-developer #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5177286
fix: Rename inner module from argoproj-labs to redhat-developer
olivergondza Oct 1, 2026
0e93488
Merge branch 'master' of github.com:redhat-developer/gitops-operator …
olivergondza Oct 8, 2026
0f232c8
Merge branch 'master' of github.com:redhat-developer/gitops-operator …
olivergondza Oct 12, 2026
0791547
Merge branch 'master' of github.com:redhat-developer/gitops-operator …
olivergondza Oct 14, 2026
577bc74
Merge branch 'master' of github.com:redhat-developer/gitops-operator …
olivergondza Oct 15, 2026
d18b6de
Merge branch 'master' of github.com:redhat-developer/gitops-operator …
olivergondza Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion argocd-operator/api/v1alpha1/argocd_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/conversion"

"github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

var conversionLogger = ctrl.Log.WithName("conversion-webhook")
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/api/v1alpha1/argocd_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/conversion"

v1beta1 "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
v1beta1 "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

type argoCDAlphaOpt func(*ArgoCD)
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/api/v1alpha1/argocd_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

routev1 "github.com/openshift/api/route/v1"

"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"

autoscaling "k8s.io/api/autoscaling/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/api/v1alpha1/argocd_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
)

func Test_ArgoCD_ApplicationInstanceLabelKey(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/api/v1beta1/argocd_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

routev1 "github.com/openshift/api/route/v1"

"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"

autoscaling "k8s.io/api/autoscaling/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/api/v1beta1/argocd_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
)

func Test_ArgoCD_ApplicationInstanceLabelKey(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/applicationset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (

"github.com/argoproj/argo-cd/v3/util/glob"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/applicationset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

func applicationSetDefaultVolumes() []v1.Volume {
Expand Down
8 changes: 4 additions & 4 deletions argocd-operator/controllers/argocd/argocd_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (

"github.com/prometheus/client_golang/prometheus"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -44,7 +44,7 @@ import (
logr "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

tlsProfile "github.com/argoproj-labs/gitops-operator/argocd-operator/pkg/tlsprofile"
tlsProfile "github.com/redhat-developer/gitops-operator/argocd-operator/pkg/tlsprofile"
)

type tokenRenewalTimer struct {
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/argocd_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

var _ reconcile.Reconciler = &ReconcileArgoCD{}
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/commitserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

// UseCommitServer automagially decides if the commit server should be deployed based on acual use-cases using it.
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/controllers/argocd/commitserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

func TestShouldDeployCommitServer(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

// createRBACConfigMap will create the Argo CD RBAC ConfigMap resource.
Expand Down
8 changes: 4 additions & 4 deletions argocd-operator/controllers/argocd/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
"github.com/argoproj-labs/gitops-operator/argocd-operator/pkg/tlsprofile"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
"github.com/redhat-developer/gitops-operator/argocd-operator/pkg/tlsprofile"
)

var _ reconcile.Reconciler = &ReconcileArgoCD{}
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/custommapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/argoproj/argo-cd/v3/util/glob"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"

corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions argocd-operator/controllers/argocd/custommapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
routev1 "github.com/openshift/api/route/v1"
"github.com/stretchr/testify/assert"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"

corev1 "k8s.io/api/core/v1"
testclient "k8s.io/client-go/kubernetes/fake"
Expand Down
10 changes: 5 additions & 5 deletions argocd-operator/controllers/argocd/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"strings"
"time"

argoprojv1alpha1 "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1alpha1"
argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/argoproj-labs/gitops-operator/argocd-operator/pkg/tlsprofile"
argoprojv1alpha1 "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1alpha1"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/redhat-developer/gitops-operator/argocd-operator/pkg/tlsprofile"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
8 changes: 4 additions & 4 deletions argocd-operator/controllers/argocd/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/argoproj-labs/gitops-operator/argocd-operator/pkg/tlsprofile"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/redhat-developer/gitops-operator/argocd-operator/pkg/tlsprofile"

"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
Expand All @@ -33,7 +33,7 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/dex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

// DexConnector represents an authentication connector for Dex.
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/dexUtil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

corev1 "k8s.io/api/core/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

// getDexContainerImage will return the container image for the Dex server.
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/dex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

func TestReconcileArgoCD_reconcileDexDeployment_with_dex_disabled(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/controllers/argocd/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions argocd-operator/controllers/argocd/hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/rbac/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
)

var errMsg = errors.New("this is a test error")
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/hpa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
autoscaling "k8s.io/api/autoscaling/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion argocd-operator/controllers/argocd/hpa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/image_pull_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
"sigs.k8s.io/controller-runtime/pkg/event"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

func testOwnerRef(cr *argoproj.ArgoCD) metav1.OwnerReference {
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/image_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions argocd-operator/controllers/argocd/image_updater_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/argoproj-labs/gitops-operator/argocd-operator/pkg/tlsprofile"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
tlsProfile "github.com/redhat-developer/gitops-operator/argocd-operator/pkg/tlsprofile"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -31,8 +31,8 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
)

// testResolveWatchNamespaces mirrors the logic in reconcileImageUpdaterControllerEnabled:
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"
)

// getArgoServerPath will return the Ingress Path for the Argo CD component.
Expand Down
4 changes: 2 additions & 2 deletions argocd-operator/controllers/argocd/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
promoter "github.com/argoproj-labs/gitops-promoter/api/v1alpha1"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
)

func TestReconcileArgoCD_reconcile_ServerIngress_ingressClassName(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions argocd-operator/controllers/argocd/localusers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

argoproj "github.com/argoproj-labs/gitops-operator/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/gitops-operator/argocd-operator/common"
"github.com/argoproj-labs/gitops-operator/argocd-operator/controllers/argoutil"
argoproj "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/argocd-operator/common"
"github.com/redhat-developer/gitops-operator/argocd-operator/controllers/argoutil"

"github.com/argoproj/argo-cd/v3/util/settings"

Expand Down
Loading
Loading