Skip to content

Commit c16e6e4

Browse files
committed
Fix failing of namespace_managemen test
Signed-off-by: Rizwana777 <[email protected]>
1 parent 9892281 commit c16e6e4

File tree

6 files changed

+23
-5
lines changed

6 files changed

+23
-5
lines changed

controllers/argocd/status.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ func (r *ReconcileArgoCD) reconcileStatusApplicationController(cr *argoproj.Argo
8080
ss := newStatefulSetWithSuffix("application-controller", "application-controller", cr)
8181
if argoutil.IsObjectFound(r.Client, cr.Namespace, ss.Name, ss) {
8282
status = "Pending"
83-
8483
if ss.Spec.Replicas != nil {
8584
if ss.Status.ReadyReplicas == *ss.Spec.Replicas {
8685
status = "Running"
@@ -122,7 +121,6 @@ func (r *ReconcileArgoCD) reconcileStatusDex(cr *argoproj.ArgoCD) error {
122121
cr.Status.SSO = status
123122
return r.Client.Status().Update(context.TODO(), cr)
124123
}
125-
126124
return nil
127125
}
128126

tests/k8s/1-046_validate_namespace_management_glob/01-argocd-cr.yaml renamed to tests/k8s/1-048_validate_namespace_management_glob/01-argocd-cr.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: argo-cd-ns
5+
---
16
apiVersion: argoproj.io/v1beta1
27
kind: ArgoCD
38
metadata:

tests/k8s/1-046_validate_namespace_management_glob/02-create-nm.yaml renamed to tests/k8s/1-048_validate_namespace_management_glob/02-create-nm.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: tenant-ui-app
5+
---
16
apiVersion: argoproj.io/v1beta1
27
kind: NamespaceManagement
38
metadata:

tests/k8s/1-046_validate_namespace_management_glob/03-verify-nm-success.yaml renamed to tests/k8s/1-048_validate_namespace_management_glob/03-verify-nm-success.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: argoproj.io/v1alpha1
1+
apiVersion: argoproj.io/v1beta1
22
kind: NamespaceManagement
33
metadata:
44
name: ui-app-namespace

tests/k8s/1-046_validate_namespace_management_glob/04-create-nm-fail.yaml renamed to tests/k8s/1-048_validate_namespace_management_glob/04-create-nm-fail.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
apiVersion: argoproj.io/v1alpha1
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: test-app
5+
---
6+
apiVersion: argoproj.io/v1beta1
27
kind: NamespaceManagement
38
metadata:
49
name: finance-app-namespace

tests/k8s/1-046_validate_namespace_management_glob/05-verify-nm-fail.yaml renamed to tests/k8s/1-048_validate_namespace_management_glob/05-verify-nm-fail.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
apiVersion: argoproj.io/v1alpha1
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: finance-app
5+
---
6+
apiVersion: argoproj.io/v1beta1
27
kind: NamespaceManagement
38
metadata:
49
name: finance-app-namespace

0 commit comments

Comments
 (0)