Skip to content

Commit 48b067f

Browse files
omohammed95omohammed95
authored
Merge branch 'main' into thanos-netpol-variable
2 parents caf8b86 + 8973b95 commit 48b067f

15 files changed

+17400
-11173
lines changed

‎CHANGELOG.md

+86
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,91 @@
11
# Changelog
22

3+
## [7.0.1](https://github.com/camptocamp/devops-stack-module-thanos/compare/v7.0.0...v7.0.1) (2024-10-11)
4+
5+
6+
### Bug Fixes
7+
8+
* 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))
9+
10+
## [7.0.0](https://github.com/camptocamp/devops-stack-module-thanos/compare/v6.0.0...v7.0.0) (2024-10-09)
11+
12+
13+
### ⚠ BREAKING CHANGES
14+
15+
* point the Argo CD provider to the new repository ([#88](https://github.com/camptocamp/devops-stack-module-thanos/issues/88))
16+
17+
### Features
18+
19+
* 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))
20+
21+
### Migrate provider source `oboukili` -> `argoproj-labs`
22+
23+
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**):
24+
25+
1. First, make sure you are already using version 6.2.0 of the `oboukili/argocd` provider.
26+
27+
1. Then, check which modules you have that are using the `oboukili/argocd` provider.
28+
29+
```shell
30+
$ terraform providers
31+
32+
Providers required by configuration:
33+
.
34+
├── provider[registry.terraform.io/hashicorp/helm] 2.15.0
35+
├── (...)
36+
└── provider[registry.terraform.io/oboukili/argocd] 6.2.0
37+
38+
Providers required by state:
39+
40+
(...)
41+
42+
provider[registry.terraform.io/oboukili/argocd]
43+
44+
provider[registry.terraform.io/hashicorp/helm]
45+
```
46+
47+
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.
48+
49+
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.
50+
51+
5. Execute the migration via `terraform state replace-provider`:
52+
53+
```bash
54+
$ terraform state replace-provider registry.terraform.io/oboukili/argocd registry.terraform.io/argoproj-labs/argocd
55+
Terraform will perform the following actions:
56+
57+
~ Updating provider:
58+
- registry.terraform.io/oboukili/argocd
59+
+ registry.terraform.io/argoproj-labs/argocd
60+
61+
Changing 13 resources:
62+
63+
module.argocd_bootstrap.argocd_project.devops_stack_applications
64+
module.secrets.module.secrets.argocd_application.this
65+
module.metrics-server.argocd_application.this
66+
module.efs.argocd_application.this
67+
module.loki-stack.module.loki-stack.argocd_application.this
68+
module.thanos.module.thanos.argocd_application.this
69+
module.cert-manager.module.cert-manager.argocd_application.this
70+
module.kube-prometheus-stack.module.kube-prometheus-stack.argocd_application.this
71+
module.argocd.argocd_application.this
72+
module.traefik.module.traefik.module.traefik.argocd_application.this
73+
module.ebs.argocd_application.this
74+
module.helloworld_apps.argocd_application.this
75+
module.helloworld_apps.argocd_project.this
76+
77+
Do you want to make these changes?
78+
Only 'yes' will be accepted to continue.
79+
80+
Enter a value: yes
81+
82+
Successfully replaced provider for 13 resources.
83+
```
84+
85+
6. Perform a `terraform init -upgrade` to upgrade your local `.terraform` folder.
86+
87+
7. Run a `terraform plan` or `terraform apply` and you should see that everything is OK and that no changes are necessary.
88+
389
## [6.0.0](https://github.com/camptocamp/devops-stack-module-thanos/compare/v5.0.0...v6.0.0) (2024-08-14)
490

591

‎README.adoc

+10-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Below you will only find the technical reference automatically generated from th
2424

2525
The following requirements are needed by this module:
2626

27-
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)
27+
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 6)
2828

2929
- [[requirement_null]] <<requirement_null,null>> (>= 3)
3030

@@ -40,16 +40,16 @@ The following providers are used by this module:
4040

4141
- [[provider_random]] <<provider_random,random>> (>= 3)
4242

43-
- [[provider_argocd]] <<provider_argocd,argocd>> (>= 5)
43+
- [[provider_argocd]] <<provider_argocd,argocd>> (>= 6)
4444

4545
- [[provider_utils]] <<provider_utils,utils>> (>= 1)
4646

4747
=== Resources
4848

4949
The following resources are used by this module:
5050

51-
- https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/application[argocd_application.this] (resource)
52-
- https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/project[argocd_project.this] (resource)
51+
- https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/application[argocd_application.this] (resource)
52+
- https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/project[argocd_project.this] (resource)
5353
- https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.dependencies] (resource)
5454
- https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.this] (resource)
5555
- 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.
114114

115115
Type: `string`
116116

117-
Default: `"v6.0.0"`
117+
Default: `"v7.0.0"`
118118

119119
==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
120120

@@ -298,7 +298,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
298298
[cols="a,a",options="header,autowidth"]
299299
|===
300300
|Name |Version
301-
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
301+
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 6
302302
|[[requirement_null]] <<requirement_null,null>> |>= 3
303303
|[[requirement_random]] <<requirement_random,random>> |>= 3
304304
|[[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
312312
|[[provider_random]] <<provider_random,random>> |>= 3
313313
|[[provider_utils]] <<provider_utils,utils>> |>= 1
314314
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
315+
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 6
315316
|[[provider_null]] <<provider_null,null>> |>= 3
316317
|===
317318
@@ -320,8 +321,8 @@ Description: ID to pass other modules in order to refer to this module as a depe
320321
[cols="a,a",options="header,autowidth"]
321322
|===
322323
|Name |Type
323-
|https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/application[argocd_application.this] |resource
324-
|https://registry.terraform.io/providers/oboukili/argocd/latest/docs/resources/project[argocd_project.this] |resource
324+
|https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/application[argocd_application.this] |resource
325+
|https://registry.terraform.io/providers/argoproj-labs/argocd/latest/docs/resources/project[argocd_project.this] |resource
325326
|https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.dependencies] |resource
326327
|https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource[null_resource.this] |resource
327328
|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
373374
|[[input_target_revision]] <<input_target_revision,target_revision>>
374375
|Override of target revision of the application chart.
375376
|`string`
376-
|`"v6.0.0"`
377+
|`"v7.0.0"`
377378
|no
378379
379380
|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

‎aks/README.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ This module has multiple ingresses and consequently it must be deployed after th
207207

208208
The following requirements are needed by this module:
209209

210-
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)
210+
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 6)
211211

212212
- [[requirement_null]] <<requirement_null,null>> (>= 3)
213213

@@ -318,7 +318,7 @@ Description: Override of target revision of the application chart.
318318

319319
Type: `string`
320320

321-
Default: `"v6.0.0"`
321+
Default: `"v7.0.0"`
322322

323323
==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
324324

@@ -502,7 +502,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
502502
[cols="a,a",options="header,autowidth"]
503503
|===
504504
|Name |Version
505-
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
505+
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 6
506506
|[[requirement_null]] <<requirement_null,null>> |>= 3
507507
|[[requirement_random]] <<requirement_random,random>> |>= 3
508508
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
@@ -600,7 +600,7 @@ object({
600600
|[[input_target_revision]] <<input_target_revision,target_revision>>
601601
|Override of target revision of the application chart.
602602
|`string`
603-
|`"v6.0.0"`
603+
|`"v7.0.0"`
604604
|no
605605
606606
|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

0 commit comments

Comments
 (0)