Skip to content

Commit 379bf0f

Browse files
chore: release 7.0.0 (#134)
* chore: release 7.0.0 * docs: update CHANGELOG.md * docs(terraform-docs): generate docs and write to README.adoc --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Gonçalo Heleno <[email protected]> Co-authored-by: lentidas <[email protected]>
1 parent 86616d9 commit 379bf0f

File tree

5 files changed

+87
-8
lines changed

5 files changed

+87
-8
lines changed

CHANGELOG.md

+79
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,84 @@
11
# Changelog
22

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

584

README.adoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ The following requirements are needed by this module:
223223

224224
The following providers are used by this module:
225225

226+
- [[provider_null]] <<provider_null,null>> (>= 3)
227+
226228
- [[provider_jwt]] <<provider_jwt,jwt>> (>= 1.1)
227229

228230
- [[provider_time]] <<provider_time,time>> (>= 0.9)
@@ -233,8 +235,6 @@ The following providers are used by this module:
233235

234236
- [[provider_utils]] <<provider_utils,utils>> (>= 1.6)
235237

236-
- [[provider_null]] <<provider_null,null>> (>= 3)
237-
238238
=== Resources
239239

240240
The following resources are used by this module:
@@ -310,7 +310,7 @@ Description: Override of target revision of the application chart.
310310

311311
Type: `string`
312312

313-
Default: `"v6.3.0"`
313+
Default: `"v7.0.0"`
314314

315315
==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
316316

@@ -692,12 +692,12 @@ Description: Map of extra accounts that were created and their tokens.
692692
[cols="a,a",options="header,autowidth"]
693693
|===
694694
|Name |Version
695-
|[[provider_null]] <<provider_null,null>> |>= 3
696695
|[[provider_jwt]] <<provider_jwt,jwt>> |>= 1.1
697696
|[[provider_time]] <<provider_time,time>> |>= 0.9
698697
|[[provider_random]] <<provider_random,random>> |>= 3
699698
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 6
700699
|[[provider_utils]] <<provider_utils,utils>> |>= 1.6
700+
|[[provider_null]] <<provider_null,null>> |>= 3
701701
|===
702702
703703
= Resources
@@ -753,7 +753,7 @@ Description: Map of extra accounts that were created and their tokens.
753753
|[[input_target_revision]] <<input_target_revision,target_revision>>
754754
|Override of target revision of the application chart.
755755
|`string`
756-
|`"v6.3.0"`
756+
|`"v7.0.0"`
757757
|no
758758
759759
|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

bootstrap/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ Description: The Argo CD accounts pipeline tokens.
201201
[cols="a,a",options="header,autowidth"]
202202
|===
203203
|Name |Version
204-
|[[provider_random]] <<provider_random,random>> |>= 3
205204
|[[provider_jwt]] <<provider_jwt,jwt>> |>= 1.1
206205
|[[provider_time]] <<provider_time,time>> |>= 0.9
206+
|[[provider_random]] <<provider_random,random>> |>= 3
207207
|[[provider_helm]] <<provider_helm,helm>> |>= 2
208208
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 6
209209
|[[provider_utils]] <<provider_utils,utils>> |>= 1.6

variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variable "argocd_labels" {
3434
variable "target_revision" {
3535
description = "Override of target revision of the application chart."
3636
type = string
37-
default = "v6.3.0" # x-release-please-version
37+
default = "v7.0.0" # x-release-please-version
3838
}
3939

4040
variable "cluster_issuer" {

version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.0
1+
7.0.0

0 commit comments

Comments
 (0)