Skip to content

Update argocd-operator dependency for gitops 1.13.4 #840

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

Open
wants to merge 2 commits into
base: v1.13
Choose a base branch
from
Open

Update argocd-operator dependency for gitops 1.13.4 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a381e
update argpcd-operator dep
anandrkskd Feb 11, 2025
fd88461
update failing tests
anandrkskd Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down