diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c44ca8..659b60b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,84 @@ # Changelog +## [7.0.0](https://github.com/camptocamp/devops-stack-module-argocd/compare/v6.3.0...v7.0.0) (2024-10-09) + + +### ⚠ BREAKING CHANGES + +* point the Argo CD provider to the new repository ([#133](https://github.com/camptocamp/devops-stack-module-argocd/issues/133)) + +### Features + +* point the Argo CD provider to the new repository ([#133](https://github.com/camptocamp/devops-stack-module-argocd/issues/133)) ([86616d9](https://github.com/camptocamp/devops-stack-module-argocd/commit/86616d9f49b6a73eb521bac27c052b0d2a38b798)) + +### Migrate provider source `oboukili` -> `argoproj-labs` + +We've tested the procedure found [here](https://github.com/argoproj-labs/terraform-provider-argocd?tab=readme-ov-file#migrate-provider-source-oboukili---argoproj-labs) and we think the order of the steps is not exactly right. This is the procedure we recommend (**note that this should be run manually on your machine and not on a CI/CD workflow**): + +1. First, make sure you are already using version 6.2.0 of the `oboukili/argocd` provider. + +1. Then, check which modules you have that are using the `oboukili/argocd` provider. + +```shell +$ terraform providers + +Providers required by configuration: +. +├── provider[registry.terraform.io/hashicorp/helm] 2.15.0 +├── (...) +└── provider[registry.terraform.io/oboukili/argocd] 6.2.0 + +Providers required by state: + + (...) + + provider[registry.terraform.io/oboukili/argocd] + + provider[registry.terraform.io/hashicorp/helm] +``` + +3. Afterwards, proceed to point **ALL* the DevOps Stack modules to the versions that have changed the source on their respective requirements. In case you have other personal modules that also declare `oboukili/argocd` as a requirement, you will also need to update them. + +4. Also update the required providers on your root module. If you've followed our examples, you should find that configuration on the `terraform.tf` file in the root folder. + +5. Execute the migration via `terraform state replace-provider`: + +```bash +$ terraform state replace-provider registry.terraform.io/oboukili/argocd registry.terraform.io/argoproj-labs/argocd +Terraform will perform the following actions: + + ~ Updating provider: + - registry.terraform.io/oboukili/argocd + + registry.terraform.io/argoproj-labs/argocd + +Changing 13 resources: + + module.argocd_bootstrap.argocd_project.devops_stack_applications + module.secrets.module.secrets.argocd_application.this + module.metrics-server.argocd_application.this + module.efs.argocd_application.this + module.loki-stack.module.loki-stack.argocd_application.this + module.thanos.module.thanos.argocd_application.this + module.cert-manager.module.cert-manager.argocd_application.this + module.kube-prometheus-stack.module.kube-prometheus-stack.argocd_application.this + module.argocd.argocd_application.this + module.traefik.module.traefik.module.traefik.argocd_application.this + module.ebs.argocd_application.this + module.helloworld_apps.argocd_application.this + module.helloworld_apps.argocd_project.this + +Do you want to make these changes? +Only 'yes' will be accepted to continue. + +Enter a value: yes + +Successfully replaced provider for 13 resources. +``` + +6. Perform a `terraform init -upgrade` to upgrade your local `.terraform` folder. + +7. Run a `terraform plan` or `terraform apply` and you should see that everything is OK and that no changes are necessary. + ## [6.3.0](https://github.com/camptocamp/devops-stack-module-argocd/compare/v6.2.0...v6.3.0) (2024-08-29) diff --git a/README.adoc b/README.adoc index 9d8f6da..d2839fc 100644 --- a/README.adoc +++ b/README.adoc @@ -223,6 +223,8 @@ The following requirements are needed by this module: The following providers are used by this module: +- [[provider_null]] <> (>= 3) + - [[provider_jwt]] <> (>= 1.1) - [[provider_time]] <> (>= 0.9) @@ -233,8 +235,6 @@ The following providers are used by this module: - [[provider_utils]] <> (>= 1.6) -- [[provider_null]] <> (>= 3) - === Resources The following resources are used by this module: @@ -310,7 +310,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v6.3.0"` +Default: `"v7.0.0"` ==== [[input_cluster_issuer]] <> @@ -692,12 +692,12 @@ Description: Map of extra accounts that were created and their tokens. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[provider_null]] <> |>= 3 |[[provider_jwt]] <> |>= 1.1 |[[provider_time]] <> |>= 0.9 |[[provider_random]] <> |>= 3 |[[provider_argocd]] <> |>= 6 |[[provider_utils]] <> |>= 1.6 +|[[provider_null]] <> |>= 3 |=== = Resources @@ -753,7 +753,7 @@ Description: Map of extra accounts that were created and their tokens. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v6.3.0"` +|`"v7.0.0"` |no |[[input_cluster_issuer]] <> diff --git a/bootstrap/README.adoc b/bootstrap/README.adoc index 4e80546..0d2b773 100644 --- a/bootstrap/README.adoc +++ b/bootstrap/README.adoc @@ -201,9 +201,9 @@ Description: The Argo CD accounts pipeline tokens. [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[provider_random]] <> |>= 3 |[[provider_jwt]] <> |>= 1.1 |[[provider_time]] <> |>= 0.9 +|[[provider_random]] <> |>= 3 |[[provider_helm]] <> |>= 2 |[[provider_argocd]] <> |>= 6 |[[provider_utils]] <> |>= 1.6 diff --git a/variables.tf b/variables.tf index 22c251e..1204dc1 100644 --- a/variables.tf +++ b/variables.tf @@ -34,7 +34,7 @@ variable "argocd_labels" { variable "target_revision" { description = "Override of target revision of the application chart." type = string - default = "v6.3.0" # x-release-please-version + default = "v7.0.0" # x-release-please-version } variable "cluster_issuer" { diff --git a/version.txt b/version.txt index 798e389..66ce77b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.3.0 +7.0.0