Skip to content
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

Update to latest commit of argo-rollouts-manager '52fd4a22e49e9bb0a3947262cce75931b63b209b' #782

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Update to latest commit of argo-rollouts-manager '52fd4a22e49e9bb0a3947262cce75931b63b209b' #782

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
579b915
Update to latest commit of argo-rollouts-manager '52fd4a22e49e9bb0a39…
jgwest Oct 3, 2024
29b2812
Add namespace to Rollouts kuttl tests
jgwest Oct 4, 2024
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 @@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
go 1.21.0

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e
github.com/argoproj-labs/argocd-operator v0.12.0-rc3
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.4.2
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 @@ -620,8 +620,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ=
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e h1:qp6+6Ii2yF3vlIOuLZPrcgmb11fBh+xLR6bNPZpFNiw=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
github.com/argoproj-labs/argocd-operator v0.12.0-rc3 h1:UqHQFeaZKWY8IqsAgLU3CwjRymcYCsJ01Wysqf7nDiY=
github.com/argoproj-labs/argocd-operator v0.12.0-rc3/go.mod h1:+yvFAnSJZL8iOTWI3cTQ9qwXfh40lLyOI4ghDFqM8S0=
github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-rollouts-e2e-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"

# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
# - It should always point to the same argo-rollouts-manager commit that is referenced in go.mod of gitops-operator (which will usually be the most recent argo-rollouts-manager commit)
TARGET_ROLLOUT_MANAGER_COMMIT=a96aa79b546433ee2d68f48d424baaabed0cb2ac
TARGET_ROLLOUT_MANAGER_COMMIT=52fd4a22e49e9bb0a3947262cce75931b63b209b

# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
# - It should always point to the same argo-rollouts-manager commit that is referenced in the version of argo-rollouts-manager that is in go.mod
Expand Down Expand Up @@ -68,3 +68,4 @@ git checkout $TARGET_OPENSHIFT_ROUTE_ROLLOUT_PLUGIN_COMMIT

make test-e2e


4 changes: 4 additions & 0 deletions test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: argo-rollouts
namespace: openshift-gitops
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down Expand Up @@ -33,15 +34,18 @@ kind: Secret
apiVersion: v1
metadata:
name: argo-rollouts-notification-secret
namespace: openshift-gitops
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: argo-rollouts
namespace: openshift-gitops
status:
readyReplicas: 1
---
apiVersion: v1
kind: Service
metadata:
name: argo-rollouts-metrics
namespace: openshift-gitops
1 change: 1 addition & 0 deletions .../e2e/sequential/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1
kind: RolloutManager
metadata:
name: example-rollout-manager
namespace: openshift-gitops
labels:
example: example-rollout-manager
spec: {}
1 change: 1 addition & 0 deletions test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ apiVersion: argoproj.io/v1alpha1
kind: RolloutManager
metadata:
name: example-rollout-manager
namespace: openshift-gitops
status:
phase: Available
1 change: 1 addition & 0 deletions ...enshift/e2e/sequential/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1
kind: RolloutManager
metadata:
name: example-rollout-manager
namespace: openshift-gitops
labels:
example: example-rollout-manager
spec: {}