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

Jump to bottom

feat(argo-cd): Update to Argo CD v2.4.0 #1325

Merged
merged 9 commits into from
Jun 14, 2022
Merged

feat(argo-cd): Update to Argo CD v2.4.0 #1325

merged 9 commits into from
Jun 14, 2022

Conversation

minhthong582000
Copy link
Contributor

@minhthong582000 minhthong582000 commented Jun 13, 2022 •
edited
Loading

  • Upgrade ArgoCD to v2.4.0.

  • Specify logs RBAC enforcement config in server. According to this docs: 2.4 introduced logs as a new RBAC resource. In 2.3, users with applications, get access automatically get logs access. In 2.5, you will have to explicitly grant logs, get access.. So I think we should put the configuration to values as a reminder to prepare for future releases.

  • Remove ksonnet and helm 2 support from Application and ApplicationSet CRDs

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • I have bumped the chart version according to versioning
  • I have updated the documentation according to documentation
  • I have updated the chart changelog with all the changes that come with this pull request according to changelog.
  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.
  • My build is green (troubleshooting builds).

Changes are automatically published when merged to main. They are not published on branches.

sathieu and others added 2 commits April 30, 2022 08:06
@sathieu
feat(argo-cd): Upgrade redis to 7.0.0
c36c341 
Including CVEs.

Ref: https://github.com/redis/redis/blob/7.0/00-RELEASENOTES
Signed-off-by: Mathieu Parent <math.parent@gmail.com>
@pdrastil
feat(argo-cd): Use upstream applicationset binary
421fd18 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
mbevc1
mbevc1 requested changes Jun 13, 2022
View reviewed changes
@mbevc1
Copy link
Collaborator

mbevc1 commented Jun 13, 2022

Do we also need to update CRDs? 🤔

@minhthong582000
Copy link
Contributor Author

Do we also need to update CRDs? 🤔

I think yes, since they drop support for KSonnet and Helm 2.

I will push new changes in https://github.com/argoproj/argo-cd/tree/v2.4.0/manifests/crds to crds.

@github-actions github-actions bot added size/XXL and removed size/S labels Jun 13, 2022
@minhthong582000 minhthong582000 force-pushed the argo-cd-2.4.0 branch 4 times, most recently from c278ffb to fbc3864 Compare June 13, 2022 18:15
thonglm2 added 3 commits June 14, 2022 01:15
feat(argo-cd): Update Argo CD to v2.4.0
d416352 
Signed-off-by: thonglm2 <thonglm2@vng.com.vn>
Specify logs RBAC enforcement config in server
a4a955f 
Argocd v2.4 introduced logs as a new RBAC resource. We should remind user to set the flag now for an easier upgrade experience in future releases.

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>
Remove ksonnet and helm 2 support from Application and ApplicationSet…
82ee8e3 
… CRDs

KSonnet and Helm2 support is removed in v2.4. See: https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#ksonnet-support-is-removed and https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#helm-2-support-is-removed

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>
@minhthong582000 minhthong582000 force-pushed the argo-cd-2.4.0 branch 3 times, most recently from b463eee to 72ac110 Compare June 13, 2022 18:42
mkilchhofer
mkilchhofer requested changes Jun 13, 2022
View reviewed changes
@mkilchhofer mkilchhofer changed the title Feat(argo-cd): Update to Argo CD v2.4.0 feat(argo-cd): Update to Argo CD v2.4.0 Jun 14, 2022
Specify logs RBAC enforcement config in argocd-cm
4ccace0 
Argocd v2.4 introduced logs as a new RBAC resource. We should remind user to set the flag now for an easier upgrade in future releases.

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>
@EugeneLugovtsov
Copy link
Contributor

@minhthong582000, maybe we should change the image for applicationset from the quay.io/argoproj/argocd-applicationset to the quay.io/argoproj/argocd?

https://github.com/argoproj/argo-cd/blob/v2.4.0/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml#L22

@mkilchhofer
Copy link
Member

mkilchhofer commented Jun 14, 2022 •
edited
Loading

Also merged #1245 and #1266 as their target are 2.4.x

@minhthong582000, maybe we should change the image for applicationset from the quay.io/argoproj/argocd-applicationset to the quay.io/argoproj/argocd?

https://github.com/argoproj/argo-cd/blob/v2.4.0/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml#L22

--> Solved via merge of #1266

This was referenced Jun 14, 2022
Closed
Closed
@pdrastil
Copy link
Member

@mkilchhofer I've noticed that applicationset controller now have entrypoint.sh in the manifest. Maybe this should be added as well. Ref: https://github.com/argoproj/argo-cd/blob/3966e508905037e031f25bf599a3e65c6f4b9fb0/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml#L20

mkilchhofer
mkilchhofer approved these changes Jun 14, 2022
View reviewed changes
Copy link
Member

@mkilchhofer mkilchhofer 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 for your contributions @minhthong582000 , @pdrastil and @sathieu

@mkilchhofer
Add entrypoint.sh on applicationset deployment
823005d 
Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
@mkilchhofer
Copy link
Member

@mkilchhofer I've noticed that applicationset controller now have entrypoint.sh in the manifest. Maybe this should be added as well. Ref: https://github.com/argoproj/argo-cd/blob/3966e508905037e031f25bf599a3e65c6f4b9fb0/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml#L20

Nice spotted! Thanks, also added this

@mkilchhofer mkilchhofer requested a review from mbevc1 June 14, 2022 09:47
mbevc1
mbevc1 approved these changes Jun 14, 2022
View reviewed changes
Copy link
Collaborator

@mbevc1 mbevc1 left a comment

Choose a reason for hiding this comment

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

Thanks for the changes

charts/argo-cd/Chart.yaml Outdated
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 4.8.3
version: 4.8.4
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you please bump the minor version here as well?

Suggested change
version: 4.8.4
version: 4.9.0

@mbevc1 mbevc1 merged commit 04f4cb0 into argoproj:main Jun 14, 2022
@hairmare hairmare mentioned this pull request Jun 14, 2022
Merged
6 tasks
terrych0u pushed a commit to terrych0u/argo-helm that referenced this pull request Aug 4, 2022
@minhthong582000 @sathieu
@pdrastil @mkilchhofer @terrych0u
feat(argo-cd): Update to Argo CD v2.4.0 (argoproj#1325)
8571722 
* feat(argo-cd): Upgrade redis to 7.0.0

Including CVEs.

Ref: https://github.com/redis/redis/blob/7.0/00-RELEASENOTES
Signed-off-by: Mathieu Parent <math.parent@gmail.com>

* feat(argo-cd): Use upstream applicationset binary

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

* feat(argo-cd): Update Argo CD to v2.4.0

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>

* Specify logs RBAC enforcement config in server
Argocd v2.4 introduced logs as a new RBAC resource. We should remind user to set the flag now for an easier upgrade experience in future releases.

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>

* Remove ksonnet and helm 2 support from Application and ApplicationSet CRDs
KSonnet and Helm2 support is removed in v2.4. See: https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#ksonnet-support-is-removed and https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#helm-2-support-is-removed

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>

* Specify logs RBAC enforcement config in argocd-cm
Argocd v2.4 introduced logs as a new RBAC resource. We should remind user to set the flag now for an easier upgrade in future releases.

Signed-off-by: thonglm2 <thonglm2@vng.com.vn>

* Add entrypoint.sh on applicationset deployment

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Mathieu Parent <math.parent@gmail.com>
Co-authored-by: Petr Drastil <petr.drastil@gmail.com>
Co-authored-by: thonglm2 <thonglm2@vng.com.vn>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkilchhofer mkilchhofer mkilchhofer approved these changes

@mbevc1 mbevc1 mbevc1 approved these changes

@davidkarlsen davidkarlsen Awaiting requested review from davidkarlsen

@yann-soubeyrand yann-soubeyrand Awaiting requested review from yann-soubeyrand

@yu-croco yu-croco Awaiting requested review from yu-croco yu-croco is a code owner

Assignees
No one assigned
Labels
argo-cd size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@minhthong582000 @mbevc1 @EugeneLugovtsov @mkilchhofer @pdrastil @sathieu