Skip to content

Commit e077ef6

Browse files
saumeyasaumeya
authored
chore: upgrade operator-sdk to 1.35.0 and migrate kubebuilder go/v3 to go/v4 (#1449)
* chore: upgrade operator-sdk and kube-builder Signed-off-by: saumeya <[email protected]> * ci fix Signed-off-by: saumeya <[email protected]> * rebase Signed-off-by: saumeya <[email protected]> --------- Signed-off-by: saumeya <[email protected]>
1 parent 5c96ddd commit e077ef6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+60
-60
lines changed

‎.github/workflows/ci-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
set -o pipefail
9898
make install generate fmt vet
9999
# Use tee to flush output to the log. Other solutions like stdbuf don't work, not sure why.
100-
REDIS_CONFIG_PATH="build/redis" go run ./main.go 2>&1 | tee /tmp/e2e-operator-run.log &
100+
REDIS_CONFIG_PATH="build/redis" go run ./cmd/main.go 2>&1 | tee /tmp/e2e-operator-run.log &
101101
- name: Run tests
102102
run: |
103103
set -o pipefail

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ COPY go.sum go.sum
1010
RUN go mod download
1111

1212
# Copy the go source
13-
COPY main.go main.go
13+
COPY cmd/main.go cmd/main.go
1414
COPY api/ api/
1515
COPY common/ common/
16-
COPY controllers/ controllers/
16+
COPY internal/controller/ internal/controller/
1717
COPY version/ version/
1818

1919
# Build
2020
ARG LD_FLAGS
21-
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="$LD_FLAGS" -a -o manager main.go
21+
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="$LD_FLAGS" -a -o manager cmd/main.go
2222

2323
# Use distroless as minimal base image to package the manager binary
2424
# Refer to https://github.com/GoogleContainerTools/distroless for more details

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
3434

3535
# Set the Operator SDK version to use.
3636
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
37-
OPERATOR_SDK_VERSION ?= v1.32.0
37+
OPERATOR_SDK_VERSION ?= v1.35.0
3838

3939

4040
# IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images.
@@ -104,10 +104,10 @@ test: manifests generate fmt vet envtest ## Run tests.
104104
##@ Build
105105

106106
build: generate fmt vet ## Build manager binary.
107-
go build -ldflags=$(LD_FLAGS) -o bin/manager main.go
107+
go build -ldflags=$(LD_FLAGS) -o bin/manager cmd/main.go
108108

109109
run: manifests generate fmt vet ## Run a controller from your host.
110-
REDIS_CONFIG_PATH="build/redis" go run -ldflags=$(LD_FLAGS) ./main.go
110+
REDIS_CONFIG_PATH="build/redis" go run -ldflags=$(LD_FLAGS) ./cmd/main.go
111111

112112
docker-build: test ## Build docker image with the manager.
113113
$(CONTAINER_RUNTIME) build --build-arg LD_FLAGS=$(LD_FLAGS) -t ${IMG} .

‎PROJECT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
layout:
2-
- go.kubebuilder.io/v3
2+
- go.kubebuilder.io/v4
33
plugins:
44
manifests.sdk.operatorframework.io/v2: {}
55
scorecard.sdk.operatorframework.io/v2: {}

‎bundle.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=argocd-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
11-
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
11+
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
1212

1313
# Labels for testing.
1414
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

‎bundle/manifests/argocd-operator.clusterserviceversion.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ metadata:
247247
capabilities: Deep Insights
248248
categories: Integration & Delivery
249249
certified: "false"
250-
createdAt: "2024-07-10T07:02:10Z"
250+
createdAt: "2024-07-11T01:33:35Z"
251251
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
252-
operators.operatorframework.io/builder: operator-sdk-v1.32.0
253-
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
252+
operators.operatorframework.io/builder: operator-sdk-v1.35.0
253+
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
254254
repository: https://github.com/argoproj-labs/argocd-operator
255255
support: Argo CD
256256
name: argocd-operator.v0.10.1

‎bundle/metadata/annotations.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: argocd-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
10-
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
10+
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
1111

1212
# Annotations for testing.
1313
operators.operatorframework.io.test.mediatype.v1: scorecard+v1

‎main.go ‎cmd/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/webhook"
3737

3838
"github.com/argoproj-labs/argocd-operator/common"
39-
"github.com/argoproj-labs/argocd-operator/controllers/argocd"
40-
"github.com/argoproj-labs/argocd-operator/controllers/argocdexport"
39+
"github.com/argoproj-labs/argocd-operator/internal/controller/argocd"
40+
"github.com/argoproj-labs/argocd-operator/internal/controller/argocdexport"
4141

4242
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4343

44-
notificationsConfig "github.com/argoproj-labs/argocd-operator/controllers/notificationsconfiguration"
44+
notificationsConfig "github.com/argoproj-labs/argocd-operator/internal/controller/notificationsconfiguration"
4545

4646
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
4747
// to ensure that exec-entrypoint and run can make use of them.

‎deploy/olm-catalog/argocd-operator/0.10.1/argocd-operator.v0.10.1.clusterserviceversion.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ metadata:
247247
capabilities: Deep Insights
248248
categories: Integration & Delivery
249249
certified: "false"
250-
createdAt: "2024-07-10T07:02:10Z"
250+
createdAt: "2024-07-11T01:33:35Z"
251251
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
252-
operators.operatorframework.io/builder: operator-sdk-v1.32.0
253-
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
252+
operators.operatorframework.io/builder: operator-sdk-v1.35.0
253+
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
254254
repository: https://github.com/argoproj-labs/argocd-operator
255255
support: Argo CD
256256
name: argocd-operator.v0.10.1

‎controllers/argocd/applicationset.go ‎internal/controller/argocd/applicationset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434

3535
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3636
"github.com/argoproj-labs/argocd-operator/common"
37-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
37+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3838
)
3939

4040
const (

‎controllers/argocd/applicationset_test.go ‎internal/controller/argocd/applicationset_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737

3838
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3939
"github.com/argoproj-labs/argocd-operator/common"
40-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
40+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
4141
)
4242

4343
func applicationSetDefaultVolumeMounts() []corev1.VolumeMount {

‎controllers/argocd/argocd_controller.go ‎internal/controller/argocd/argocd_controller.go

File renamed without changes.

‎controllers/argocd/argocd_controller_test.go ‎internal/controller/argocd/argocd_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535

3636
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3737
"github.com/argoproj-labs/argocd-operator/common"
38-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
38+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3939
)
4040

4141
var _ reconcile.Reconciler = &ReconcileArgoCD{}

‎controllers/argocd/configmap.go ‎internal/controller/argocd/configmap.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2828
"github.com/argoproj-labs/argocd-operator/common"
29-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
29+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3030
)
3131

3232
// createRBACConfigMap will create the Argo CD RBAC ConfigMap resource.

‎controllers/argocd/configmap_test.go ‎internal/controller/argocd/configmap_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3535
"github.com/argoproj-labs/argocd-operator/common"
36-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
36+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3737
)
3838

3939
var _ reconcile.Reconciler = &ReconcileArgoCD{}

‎controllers/argocd/custommapper.go ‎internal/controller/argocd/custommapper.go

File renamed without changes.

‎controllers/argocd/custommapper_test.go ‎internal/controller/argocd/custommapper_test.go

File renamed without changes.

‎controllers/argocd/deployment.go ‎internal/controller/argocd/deployment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
2727
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2828
"github.com/argoproj-labs/argocd-operator/common"
29-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
29+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3030

3131
appsv1 "k8s.io/api/apps/v1"
3232
corev1 "k8s.io/api/core/v1"

‎controllers/argocd/deployment_test.go ‎internal/controller/argocd/deployment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
logf "sigs.k8s.io/controller-runtime/pkg/log"
2020

2121
"github.com/argoproj-labs/argocd-operator/common"
22-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
22+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2323

2424
"github.com/google/go-cmp/cmp"
2525
"github.com/stretchr/testify/assert"

‎controllers/argocd/dex.go ‎internal/controller/argocd/dex.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2121
"github.com/argoproj-labs/argocd-operator/common"
22-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
22+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2323
)
2424

2525
// DexConnector represents an authentication connector for Dex.

‎controllers/argocd/dexUtil.go ‎internal/controller/argocd/dexUtil.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
1010
"github.com/argoproj-labs/argocd-operator/common"
11-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
11+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
1212
)
1313

1414
// getDexContainerImage will return the container image for the Dex server.

‎controllers/argocd/dex_test.go ‎internal/controller/argocd/dex_test.go

File renamed without changes.

‎controllers/argocd/hooks.go ‎internal/controller/argocd/hooks.go

File renamed without changes.

‎controllers/argocd/hooks_test.go ‎internal/controller/argocd/hooks_test.go

File renamed without changes.

‎controllers/argocd/hpa.go ‎internal/controller/argocd/hpa.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2525
"github.com/argoproj-labs/argocd-operator/common"
26-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
26+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2727
)
2828

2929
var (

‎controllers/argocd/hpa_test.go ‎internal/controller/argocd/hpa_test.go

File renamed without changes.

‎controllers/argocd/ingress.go ‎internal/controller/argocd/ingress.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2626
"github.com/argoproj-labs/argocd-operator/common"
27-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
27+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2828
)
2929

3030
// getArgoServerPath will return the Ingress Path for the Argo CD component.

‎controllers/argocd/ingress_test.go ‎internal/controller/argocd/ingress_test.go

File renamed without changes.

‎controllers/argocd/keycloak.go ‎internal/controller/argocd/keycloak.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2626
"github.com/argoproj-labs/argocd-operator/common"
27-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
27+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2828

2929
appsv1 "github.com/openshift/api/apps/v1"
3030

‎controllers/argocd/keycloak_client.go ‎internal/controller/argocd/keycloak_client.go

File renamed without changes.

‎controllers/argocd/keycloak_client_test.go ‎internal/controller/argocd/keycloak_client_test.go

File renamed without changes.

‎controllers/argocd/keycloak_test.go ‎internal/controller/argocd/keycloak_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3333
"github.com/argoproj-labs/argocd-operator/common"
34-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
34+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3535
)
3636

3737
var (

‎controllers/argocd/keycloak_types.go ‎internal/controller/argocd/keycloak_types.go

File renamed without changes.

‎controllers/argocd/metrics.go ‎internal/controller/argocd/metrics.go

File renamed without changes.

‎controllers/argocd/networkpolicies.go ‎internal/controller/argocd/networkpolicies.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"reflect"
77

88
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
9-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
9+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
1010
corev1 "k8s.io/api/core/v1"
1111
networkingv1 "k8s.io/api/networking/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/argocd/networkpolicies_test.go ‎internal/controller/argocd/networkpolicies_test.go

File renamed without changes.

‎controllers/argocd/notifications.go ‎internal/controller/argocd/notifications.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
corev1 "k8s.io/api/core/v1"
1212
rbacv1 "k8s.io/api/rbac/v1"
1313
"k8s.io/apimachinery/pkg/api/errors"
14-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1514
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1615
"k8s.io/apimachinery/pkg/types"
1716
"k8s.io/apimachinery/pkg/util/intstr"
@@ -20,7 +19,7 @@ import (
2019
"github.com/argoproj-labs/argocd-operator/api/v1alpha1"
2120
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2221
"github.com/argoproj-labs/argocd-operator/common"
23-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
22+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2423
)
2524

2625
const (
@@ -79,7 +78,7 @@ func (r *ReconcileArgoCD) reconcileNotificationsController(cr *argoproj.ArgoCD)
7978
func (r *ReconcileArgoCD) reconcileNotificationsConfigurationCR(cr *argoproj.ArgoCD) error {
8079

8180
defaultNotificationsConfigurationCR := &v1alpha1.NotificationsConfiguration{
82-
ObjectMeta: metav1.ObjectMeta{
81+
ObjectMeta: v1.ObjectMeta{
8382
Name: DefaultNotificationsConfigurationInstanceName,
8483
Namespace: cr.Namespace,
8584
},

‎controllers/argocd/notifications_test.go ‎internal/controller/argocd/notifications_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/argoproj-labs/argocd-operator/api/v1alpha1"
2424
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2525
"github.com/argoproj-labs/argocd-operator/common"
26-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
26+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2727
)
2828

2929
func TestReconcileNotifications_CreateRoles(t *testing.T) {

‎controllers/argocd/notifications_util.go ‎internal/controller/argocd/notifications_util.go

File renamed without changes.

‎controllers/argocd/policyrule.go ‎internal/controller/argocd/policyrule.go

File renamed without changes.

‎controllers/argocd/prometheus.go ‎internal/controller/argocd/prometheus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2727
"github.com/argoproj-labs/argocd-operator/common"
28-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
28+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2929
)
3030

3131
var prometheusAPIFound = false

‎controllers/argocd/prometheus_test.go ‎internal/controller/argocd/prometheus_test.go

File renamed without changes.

‎controllers/argocd/role.go ‎internal/controller/argocd/role.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
1818
"github.com/argoproj-labs/argocd-operator/common"
19-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
19+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2020
)
2121

2222
// newRole returns a new Role instance.

‎controllers/argocd/role_test.go ‎internal/controller/argocd/role_test.go

File renamed without changes.

‎controllers/argocd/rolebinding.go ‎internal/controller/argocd/rolebinding.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
1818
"github.com/argoproj-labs/argocd-operator/common"
19-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
19+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2020
)
2121

2222
// newClusterRoleBinding returns a new ClusterRoleBinding instance.

‎controllers/argocd/rolebinding_test.go ‎internal/controller/argocd/rolebinding_test.go

File renamed without changes.

‎controllers/argocd/route.go ‎internal/controller/argocd/route.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2929
"github.com/argoproj-labs/argocd-operator/common"
30-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
30+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3131
)
3232

3333
const (

‎controllers/argocd/route_test.go ‎internal/controller/argocd/route_test.go

File renamed without changes.

‎controllers/argocd/secret.go ‎internal/controller/argocd/secret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3333
"github.com/argoproj-labs/argocd-operator/common"
34-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
34+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3535

3636
corev1 "k8s.io/api/core/v1"
3737
apierrors "k8s.io/apimachinery/pkg/api/errors"

‎controllers/argocd/secret_test.go ‎internal/controller/argocd/secret_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"context"
55
"crypto/sha256"
66
"fmt"
7-
argopass "github.com/argoproj/argo-cd/v2/util/password"
87
"reflect"
98
"sort"
109
"testing"
1110

11+
argopass "github.com/argoproj/argo-cd/v2/util/password"
12+
1213
configv1 "github.com/openshift/api/config/v1"
1314
routev1 "github.com/openshift/api/route/v1"
1415
"github.com/stretchr/testify/assert"
@@ -23,7 +24,7 @@ import (
2324

2425
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2526
"github.com/argoproj-labs/argocd-operator/common"
26-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
27+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2728
)
2829

2930
func Test_newCASecret(t *testing.T) {

‎controllers/argocd/service.go ‎internal/controller/argocd/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2828
"github.com/argoproj-labs/argocd-operator/common"
29-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
29+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3030
)
3131

3232
// getArgoServerServiceType will return the server Service type for the ArgoCD.

‎controllers/argocd/service_account.go ‎internal/controller/argocd/service_account.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2828
"github.com/argoproj-labs/argocd-operator/common"
29-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
29+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3030
)
3131

3232
// newServiceAccount returns a new ServiceAccount instance.

‎controllers/argocd/service_account_test.go ‎internal/controller/argocd/service_account_test.go

File renamed without changes.

‎controllers/argocd/service_test.go ‎internal/controller/argocd/service_test.go

File renamed without changes.

‎controllers/argocd/sso.go ‎internal/controller/argocd/sso.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
apiErrors "k8s.io/apimachinery/pkg/api/errors"
2424

2525
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
26-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
26+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
2727
)
2828

2929
const (

‎controllers/argocd/sso_test.go ‎internal/controller/argocd/sso_test.go

File renamed without changes.

‎controllers/argocd/statefulset.go ‎internal/controller/argocd/statefulset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
3232
"github.com/argoproj-labs/argocd-operator/common"
33-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
33+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
3434
)
3535

3636
func getRedisHAReplicas() *int32 {

‎controllers/argocd/statefulset_test.go ‎internal/controller/argocd/statefulset_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
1414
argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
15-
"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
15+
"github.com/argoproj-labs/argocd-operator/internal/controller/argoutil"
1616

1717
"github.com/google/go-cmp/cmp"
1818
appsv1 "k8s.io/api/apps/v1"

0 commit comments

Comments
 (0)