From 7a46409bdbfd088d417152737a02884df3f55c3b Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Wed, 20 Sep 2023 12:10:36 +0530 Subject: [PATCH] Replace ArgoCD v1alpha1 references with v1beta1 Signed-off-by: Siddhesh Ghadi --- controllers/argocd/custommapper_test.go | 12 ++++++------ controllers/argocd/secret_test.go | 4 ++-- controllers/argocd/testing.go | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/controllers/argocd/custommapper_test.go b/controllers/argocd/custommapper_test.go index e526dffd9..19f5854f5 100644 --- a/controllers/argocd/custommapper_test.go +++ b/controllers/argocd/custommapper_test.go @@ -119,7 +119,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -174,7 +174,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -221,7 +221,7 @@ func TestArgoCDReconciler_tlsSecretMapperRepoServer(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -336,7 +336,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -391,7 +391,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -438,7 +438,7 @@ func TestArgoCDReconciler_tlsSecretMapperRedis(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), diff --git a/controllers/argocd/secret_test.go b/controllers/argocd/secret_test.go index e83aee81d..e0cdf2890 100644 --- a/controllers/argocd/secret_test.go +++ b/controllers/argocd/secret_test.go @@ -70,7 +70,7 @@ func Test_ArgoCDReconciler_ReconcileRepoTLSSecret(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), @@ -264,7 +264,7 @@ func Test_ArgoCDReconciler_ReconcileRedisTLSSecret(t *testing.T) { Namespace: "argocd-operator", OwnerReferences: []metav1.OwnerReference{ { - APIVersion: "argoproj.io/v1alpha1", + APIVersion: "argoproj.io/v1beta1", Kind: "ArgoCD", Name: "argocd", UID: argocd.GetUID(), diff --git a/controllers/argocd/testing.go b/controllers/argocd/testing.go index 6264dfe92..64d640684 100644 --- a/controllers/argocd/testing.go +++ b/controllers/argocd/testing.go @@ -36,6 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" + argoprojv1alpha1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1" argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" ) @@ -67,7 +68,7 @@ func makeTestNs(opts ...namespaceOpt) *corev1.Namespace { func makeTestReconciler(t *testing.T, objs ...runtime.Object) *ArgoCDReconciler { s := scheme.Scheme assert.NoError(t, argoproj.AddToScheme(s)) - assert.NoError(t, argoproj.AddToScheme(s)) + assert.NoError(t, argoprojv1alpha1.AddToScheme(s)) cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build() logger := ctrl.Log.WithName("test-logger")