From 39a381e9df078f7aad8ba8b1cb6d7df9e5d97e2e Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Tue, 11 Feb 2025 15:52:19 +0530 Subject: [PATCH 1/2] update argpcd-operator dep Signed-off-by: Anand Kumar Singh --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed53e2c51..05b97cfa1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20241019175410-e054d35fd0d9 - github.com/argoproj-labs/argocd-operator v0.11.2 + github.com/argoproj-labs/argocd-operator v0.11.3-0.20250210115454-67048d6da639 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.4.1 github.com/google/go-cmp v0.6.0 diff --git a/go.sum b/go.sum index 749f4d355..00525cc4b 100644 --- a/go.sum +++ b/go.sum @@ -639,8 +639,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20241019175410-e054d35fd0d9 h1:2yX5LMiwAbJAk2F0eZLOY4+2oA3P0RVlk3UZLqoCWh8= github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20241019175410-e054d35fd0d9/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM= -github.com/argoproj-labs/argocd-operator v0.11.2 h1:BMk8Yt+tjD7ccm8ZqWLVkNFAwrVPfsa6mHSxOkG+GCw= -github.com/argoproj-labs/argocd-operator v0.11.2/go.mod h1:X7Ep51sOWllMTyqsROSZOsCSgdBCKYgkoOgxUjeAoNc= +github.com/argoproj-labs/argocd-operator v0.11.3-0.20250210115454-67048d6da639 h1:ULsO5LHMzqNIsZXt3eF8kNxvveoI6wy3X0RVcCKye+E= +github.com/argoproj-labs/argocd-operator v0.11.3-0.20250210115454-67048d6da639/go.mod h1:X7Ep51sOWllMTyqsROSZOsCSgdBCKYgkoOgxUjeAoNc= github.com/argoproj/argo-cd/v2 v2.11.12 h1:EWC2+YTicruJ7RE13ZbKx1u+7ZYQz994zuUk28BZdF4= github.com/argoproj/argo-cd/v2 v2.11.12/go.mod h1:WXdWCetNnx96Q51sFpTDC9hUOGxL5QlfjSJA2HCMJJc= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= From fd884615638d4b2cc1b9cbafd3358dbcb83b5376 Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Thu, 13 Feb 2025 16:01:54 +0530 Subject: [PATCH 2/2] update failing tests Signed-off-by: Anand Kumar Singh --- .../05-argocd_login.yaml | 2 +- .../01-login_argocd_api_server.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml index c6165d115..be4331661 100644 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml +++ b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml @@ -4,7 +4,7 @@ commands: - script: | api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - output=$(argocd login $api_server --username admin --password $password --insecure) + output=$(argocd login $api_server --username admin --password $password --insecure --skip-test-tls) if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then if [[ "${output}" == *"rpc error: code = Unknown desc = server.secretkey is missing" ]]; then diff --git a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml b/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml index ca687cb6c..5d07c531f 100644 --- a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml +++ b/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml @@ -5,7 +5,7 @@ commands: api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - output=$(argocd login $api_server --username admin --password $password --insecure) + output=$(argocd login $api_server --username admin --password $password --insecure --skip-test-tls) if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then exit 1