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

chore: Upgrade argocd-operator versions #803

Merged
merged 3 commits into from
Nov 8, 2024
Merged

chore: Upgrade argocd-operator versions #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe4c9c
update argocd-operator version
ishitasequeira Nov 6, 2024
099a368
update CRDs
ishitasequeira Nov 7, 2024
4419b95
make bundle
svghadi Nov 7, 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
10 changes: 10 additions & 0 deletions bundle/manifests/argoproj.io_applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ spec:
sync:
description: Sync contains parameters for the operation
properties:
autoHealAttemptsCount:
description: SelfHealAttemptsCount contains the number of auto-heal
attempts
format: int64
type: integer
dryRun:
description: DryRun specifies to perform a `kubectl apply --dry-run`
without actually performing the sync
Expand Down Expand Up @@ -2537,6 +2542,11 @@ spec:
sync:
description: Sync contains parameters for the operation
properties:
autoHealAttemptsCount:
description: SelfHealAttemptsCount contains the number
of auto-heal attempts
format: int64
type: integer
dryRun:
description: DryRun specifies to perform a `kubectl apply
--dry-run` without actually performing the sync
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/gitops-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ metadata:
capabilities: Deep Insights
console.openshift.io/plugins: '["gitops-plugin"]'
containerImage: quay.io/redhat-developer/gitops-operator
createdAt: "2024-10-04T04:12:36Z"
createdAt: "2024-11-07T13:35:52Z"
description: Enables teams to adopt GitOps principles for managing cluster configurations
and application delivery across hybrid multi-cluster Kubernetes environments.
features.operators.openshift.io/disconnected: "true"
Expand Down
10 changes: 10 additions & 0 deletions config/crd/bases/argoproj.io_applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ spec:
sync:
description: Sync contains parameters for the operation
properties:
autoHealAttemptsCount:
description: SelfHealAttemptsCount contains the number of auto-heal
attempts
format: int64
type: integer
dryRun:
description: DryRun specifies to perform a `kubectl apply --dry-run`
without actually performing the sync
Expand Down Expand Up @@ -2536,6 +2541,11 @@ spec:
sync:
description: Sync contains parameters for the operation
properties:
autoHealAttemptsCount:
description: SelfHealAttemptsCount contains the number
of auto-heal attempts
format: int64
type: integer
dryRun:
description: DryRun specifies to perform a `kubectl apply
--dry-run` without actually performing the sync
Expand Down
4 changes: 2 additions & 2 deletions 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.0

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241019174305-df262fe66d25
github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302
github.com/argoproj-labs/argocd-operator v0.12.2
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
Expand All @@ -27,7 +27,7 @@ require (
)

require (
github.com/argoproj/argo-cd/v2 v2.12.6 // indirect
github.com/argoproj/argo-cd/v2 v2.12.7 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cert-manager/cert-manager v1.14.4 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,10 @@ 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.5-0.20241019174305-df262fe66d25 h1:Q3Xe/zfMlZ7AqW8FT2l4cGmKfsdhC99V3bulDhD7Pqo=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241019174305-df262fe66d25/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302 h1:XCJ081tKWf3lPrlhCKF3iD7p/2SODT2Ah34EkOeEAHs=
github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302/go.mod h1:Wc7grUq8ZFE7AVFXKBRGrSdADDetjafndCVaXxn68lY=
github.com/argoproj/argo-cd/v2 v2.12.6 h1:5EEdZbsyK1trxcm4AcCt5WNgGOAmXMdZSjEfe35IV7U=
github.com/argoproj/argo-cd/v2 v2.12.6/go.mod h1:BS64uTH/mG3dEpulAI4oIyJiluuYdAbGlisR/s9FrEM=
github.com/argoproj-labs/argocd-operator v0.12.2 h1:fWCAECtkgdoAQBsOU13pOnRTLuD+Z9cbajvLEQN60x0=
github.com/argoproj-labs/argocd-operator v0.12.2/go.mod h1:0eQPIftjtMZ1ShLptYp+j4tUemF+CF5qrWBrQ1wNKgM=
github.com/argoproj/argo-cd/v2 v2.12.7 h1:ug9spvZhpxyvgpj3r3IA3woLExVkAjOdA7NAqFlm4P8=
github.com/argoproj/argo-cd/v2 v2.12.7/go.mod h1:BS64uTH/mG3dEpulAI4oIyJiluuYdAbGlisR/s9FrEM=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
Expand Down
2 changes: 1 addition & 1 deletion test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ commands:
# These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
expected_kustomizeVersion='v5.4.2'
expected_helmVersion='v3.15.2'
expected_argocdVersion='v2.12.6+4dab5bd'
expected_argocdVersion='v2.12.7'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a short commit id too added isn't it ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be matched to the version in go.mod which is automatically updated when running go mod download && go mod tidy && go mod vendor

Copy link
Member

@anandf anandf Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the test will fail as it will try to match v2.12.7+4d70c51

Copy link
Collaborator Author

@ishitasequeira ishitasequeira Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test seems to be succeeding. The version in go.mod is also reflecting v2.12.7 matching the value in test. I will try running the test locally once more.


if CI="prow"; then
# when running against openshift-ci
Expand Down