Merge branch 'main' into thanos-netpol-variable

CHANGELOG.md

@@ -1,5 +1,91 @@
 # Changelog
 
+## [7.0.1](https://github.com/camptocamp/devops-stack-module-thanos/compare/v7.0.0...v7.0.1) (2024-10-11)
+
+
+### Bug Fixes
+
+* grafana panels uses angular deprecated plugin ([#90](https://github.com/camptocamp/devops-stack-module-thanos/issues/90)) ([bf7302f](https://github.com/camptocamp/devops-stack-module-thanos/commit/bf7302f8dd3f7b5b4655f9754213e3f59f047695))
+
+## [7.0.0](https://github.com/camptocamp/devops-stack-module-thanos/compare/v6.0.0...v7.0.0) (2024-10-09)
+
+
+### ⚠ BREAKING CHANGES
+
+* point the Argo CD provider to the new repository ([#88](https://github.com/camptocamp/devops-stack-module-thanos/issues/88))
+
+### Features
+
+* point the Argo CD provider to the new repository ([#88](https://github.com/camptocamp/devops-stack-module-thanos/issues/88)) ([503c776](https://github.com/camptocamp/devops-stack-module-thanos/commit/503c77666b8d53460c747d1d7ca8256ea96d5423))
+
+### 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.0.0](https://github.com/camptocamp/devops-stack-module-thanos/compare/v5.0.0...v6.0.0) (2024-08-14)
 
 

README.adoc

@@ -24,7 +24,7 @@ Below you will only find the technical reference automatically generated from th
 
 The following requirements are needed by this module:
 
-- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)
+- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 6)
 
 - [[requirement_null]] <<requirement_null,null>> (>= 3)
 
@@ -40,16 +40,16 @@ The following providers are used by this module:
 
 - [[provider_random]] <<provider_random,random>> (>= 3)
 
-- [[provider_argocd]] <<provider_argocd,argocd>> (>= 5)
+- [[provider_argocd]] <<provider_argocd,argocd>> (>= 6)
 
 - [[provider_utils]] <<provider_utils,utils>> (>= 1)
 
 === Resources
 
 The following resources are used by this module:
 
-- https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/application[argocd_application.this] (resource)
-- https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/project[argocd_project.this] (resource)
+- https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/application[argocd_application.this] (resource)
+- https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/project[argocd_project.this] (resource)
 - https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.dependencies] (resource)
 - https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.this] (resource)
 - https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.oauth2_cookie_secret] (resource)
@@ -114,7 +114,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v6.0.0"`
+Default: `"v7.0.0"`
 
 ==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
 
@@ -298,7 +298,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
 [cols="a,a",options="header,autowidth"]
 |===
 |Name |Version
-|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
+|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 6
 |[[requirement_null]] <<requirement_null,null>> |>= 3
 |[[requirement_random]] <<requirement_random,random>> |>= 3
 |[[requirement_utils]] <<requirement_utils,utils>> |>= 1
@@ -312,6 +312,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
 |[[provider_random]] <<provider_random,random>> |>= 3
 |[[provider_utils]] <<provider_utils,utils>> |>= 1
 |[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
+|[[provider_argocd]] <<provider_argocd,argocd>> |>= 6
 |[[provider_null]] <<provider_null,null>> |>= 3
 |===
 
@@ -320,8 +321,8 @@ Description: ID to pass other modules in order to refer to this module as a depe
 [cols="a,a",options="header,autowidth"]
 |===
 |Name |Type
-|https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/application[argocd_application.this] |resource
-|https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/project[argocd_project.this] |resource
+|https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/application[argocd_application.this] |resource
+|https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/project[argocd_project.this] |resource
 |https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.dependencies] |resource
 |https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.this] |resource
 |https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.oauth2_cookie_secret] |resource
@@ -373,7 +374,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v6.0.0"`
+|`"v7.0.0"`
 |no
 
 |[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

aks/README.adoc

@@ -207,7 +207,7 @@ This module has multiple ingresses and consequently it must be deployed after th
 
 The following requirements are needed by this module:
 
-- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)
+- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 6)
 
 - [[requirement_null]] <<requirement_null,null>> (>= 3)
 
@@ -318,7 +318,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v6.0.0"`
+Default: `"v7.0.0"`
 
 ==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
 
@@ -502,7 +502,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
 [cols="a,a",options="header,autowidth"]
 |===
 |Name |Version
-|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
+|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 6
 |[[requirement_null]] <<requirement_null,null>> |>= 3
 |[[requirement_random]] <<requirement_random,random>> |>= 3
 |[[requirement_utils]] <<requirement_utils,utils>> |>= 1
@@ -600,7 +600,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v6.0.0"`
+|`"v7.0.0"`
 |no
 
 |[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>