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.

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

upgrade argo-cd version to 2.12.1 #1513

Merged
merged 10 commits into from
Aug 19, 2024

Conversation

ishitasequeira
Copy link
Collaborator

What type of PR is this?
/kind chore

What does this PR do / why we need it:

upgrade argo-cd version to 2.12.1

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Copy link
Collaborator

@anandf anandf left a comment

Choose a reason for hiding this comment

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

Update controller-gen version to 0.14.0

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Copy link
Collaborator

@saumeya saumeya left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

Dockerfile also needs an update, rest all looks good. Thanks.

# Argo CD v2.11.6
FROM quay.io/argoproj/argocd@sha256:7f82e7eec131866c3cbd91e5035381d62bd9318269cd3d16e6e2d42ede402292 as argocd

Copy link
Collaborator

@anandf anandf left a comment

Choose a reason for hiding this comment

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

Are the YAML files in https://github.com/argoproj-labs/argocd-operator/tree/master/bundle/manifests updated to take the upstream ArgoCD v2.12.1 ?

@svghadi
Copy link
Collaborator

svghadi commented Aug 19, 2024

Oh, yes. We also need to update the Argo CD Application, Project & ApplicationSet CRD in https://github.com/argoproj-labs/argocd-operator/tree/master/config/crd/bases. Just copy these files from upstream Argo CD source tag for new version.

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
@ishitasequeira
Copy link
Collaborator Author

Thanks @anandf @svghadi @saumeya for the review. It looks like there are no changes in the CRDs. Because when I replace the CRDs with 2.12.1 and execute make bundle, the CRDs revert back to it's current state. The only change I found was to how the description fields are formatted.

Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Copy link
Collaborator

@anandf anandf left a comment

Choose a reason for hiding this comment

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

LGTM

@svghadi
Copy link
Collaborator

svghadi commented Aug 19, 2024

Because when I replace the CRDs with 2.12.1 and execute make bundle, the CRDs revert back to it's current state.

Interesting. I see some latest changes in Application and Appset CRD in upstream https://github.com/argoproj/argo-cd/tree/v2.12.1/manifests/crds which are not present in our copy of CRDs here: https://github.com/argoproj-labs/argocd-operator/tree/master/config/crd/bases .

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Copy link
Collaborator

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

LGTM.. Thanks

go 1.21
go 1.21.0

toolchain go1.21.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we can remove this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Not sure how to do it. go mod tidy is adding it again even if I remove it and set to just go 1.21.

@anandf anandf merged commit 7e93883 into argoproj-labs:master Aug 19, 2024
7 checks passed
@Invincibear
Copy link

Invincibear commented Aug 21, 2024

Is this ready for a new release so we can get this pushed to https://operatorhub.io/operator/argocd-operator? v0.11 is still deploying Argo CD v2.10.12, I'd like to use the newer v2.12.1 which has some bug fixes affecting my deployment.

@svghadi
Copy link
Collaborator

svghadi commented Aug 22, 2024

Hi @Invincibear, it will still take a few weeks to get a release out. In the meantime, you can use the .spec.image and .spec.version fields in the ArgoCD CR to specify the new image to unblock yourself. Since you mentioned that there are some bug fixes in the new images that you're interested in, you likely won't run into any issues using the new image with the old operator, as the fixes, most of the times, don't require new Argo CD CRDs.

@Invincibear
Copy link

@svghadi Thanks, that worked!

@saumeya saumeya mentioned this pull request Sep 2, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants