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

Add ignore_application_differences to argocd_application_set resource #357

Merged
merged 18 commits into from
Mar 23, 2024
Merged

Add ignore_application_differences to argocd_application_set resource #357

merged 18 commits into from
Mar 23, 2024

Conversation

dtrouillet
Copy link
Contributor

Fixes #352

This PR adds support for the ignoreApplicationDifferences parameter in the ApplicationSet resources.
This PR Upgrade ArgoCD dependencies to 2.9.3

@dtrouillet dtrouillet changed the title Add ignore_application_differences support on ApplicationSet Add ignore_application_differences support on ApplicationSet + support ArgoCD 2.9.3 Dec 12, 2023
@dtrouillet
Copy link
Contributor Author

dtrouillet commented Dec 14, 2023

Good morning @oboukili, @onematchfox ,

The pull request also updates ArgoCD to 2.9.3. A test is in error because the behavior of ArgoCD changes, empty blocks such as valuesFiles and syncPolicy of Applications are automatically deleted by ArgoCD. It is therefore necessary, in my opinion, not to create these blocks when they are empty in the Terraform

Copy link

This pr is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Dec 28, 2023
@dtrouillet
Copy link
Contributor Author

@onematchfox , @oboukili , Can you help me please on this pr?

@github-actions github-actions bot removed the Stale label Dec 29, 2023
@onematchfox
Copy link
Collaborator

@onematchfox , @oboukili , Can you help me please on this pr?

Apologies for the slow reply - festive break.... Will try take a look at this in the coming days.

Copy link

This pr is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Jan 22, 2024
@dtrouillet
Copy link
Contributor Author

re-up

@github-actions github-actions bot removed the Stale label Jan 23, 2024
Copy link

github-actions bot commented Feb 7, 2024

This pr is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Feb 7, 2024
@onematchfox
Copy link
Collaborator

Not stale

@github-actions github-actions bot removed the Stale label Feb 8, 2024
dependabot bot and others added 7 commits February 20, 2024 07:55
)

Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.7.0 to 5.11.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.7.0...v5.11.0)

---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…365)

Bumps [github.com/argoproj/argo-cd/v2](https://github.com/argoproj/argo-cd) from 2.8.3 to 2.8.8.
- [Release notes](https://github.com/argoproj/argo-cd/releases)
- [Changelog](https://github.com/argoproj/argo-cd/blob/master/CHANGELOG.md)
- [Commits](argoproj/argo-cd@v2.8.3...v2.8.8)

---
updated-dependencies:
- dependency-name: github.com/argoproj/argo-cd/v2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0.
- [Commits](golang/crypto@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.3.3 to 1.3.7.
- [Release notes](https://github.com/cloudflare/circl/releases)
- [Commits](cloudflare/circl@v1.3.3...v1.3.7)

---
updated-dependencies:
- dependency-name: github.com/cloudflare/circl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link

github-actions bot commented Mar 5, 2024

This pr is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Mar 5, 2024
@dtrouillet
Copy link
Contributor Author

not stale

@github-actions github-actions bot removed the Stale label Mar 7, 2024
Copy link

This pr is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Mar 21, 2024
@dtrouillet
Copy link
Contributor Author

Not stale

@github-actions github-actions bot removed the Stale label Mar 22, 2024
@onematchfox onematchfox changed the title Add ignore_application_differences support on ApplicationSet + support ArgoCD 2.9.3 Add ignore_application_differences to argocd_application_set resource Mar 23, 2024
@onematchfox onematchfox self-requested a review March 23, 2024 15:20
Copy link
Collaborator

@onematchfox onematchfox left a comment

Choose a reason for hiding this comment

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

@dtrouillet Thanks so much for your patience! 🙏

Base changes were great and I have now handled the remaining work needed to handle the changes in newer version of ArgoCD.

@onematchfox onematchfox merged commit ea02a51 into argoproj-labs:master Mar 23, 2024
6 checks passed
@dtrouillet
Copy link
Contributor Author

@onematchfox no problem !
Awesome, thanks a lot.

@dtrouillet dtrouillet deleted the feature/ignoreApplicationDifferences branch March 23, 2024 17:33
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.

Add ignoreApplicationDifferences to applicationset resource
3 participants