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

feat!: add support to oboukili/argocd >= v5 #41

Merged
merged 2 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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>> (>= 4)
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)

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

Expand All @@ -39,7 +39,7 @@ The following providers are used by this module:

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

- [[provider_argocd]] <<provider_argocd,argocd>> (>= 4)
- [[provider_argocd]] <<provider_argocd,argocd>> (>= 5)

- [[provider_null]] <<provider_null,null>> (>= 3)

Expand Down Expand Up @@ -88,7 +88,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v1.0.1"`
Default: `"v1.1.0"`

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

Expand Down Expand Up @@ -174,7 +174,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>> |>= 4
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
|[[requirement_null]] <<requirement_null,null>> |>= 3
|[[requirement_random]] <<requirement_random,random>> |>= 3
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
Expand All @@ -188,7 +188,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
|[[provider_null]] <<provider_null,null>> |>= 3
|[[provider_random]] <<provider_random,random>> |>= 3
|[[provider_utils]] <<provider_utils,utils>> |>= 1
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 4
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
|===

= Resources
Expand Down Expand Up @@ -230,7 +230,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`
|`"v1.0.1"`
|`"v1.1.0"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down
8 changes: 4 additions & 4 deletions aks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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>> (>= 4)
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)

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

Expand Down Expand Up @@ -289,7 +289,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v1.0.1"`
Default: `"v1.1.0"`

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

Expand Down Expand Up @@ -375,7 +375,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>> |>= 4
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
|[[requirement_null]] <<requirement_null,null>> |>= 3
|[[requirement_random]] <<requirement_random,random>> |>= 3
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
Expand Down Expand Up @@ -451,7 +451,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.1"`
|`"v1.1.0"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down
8 changes: 4 additions & 4 deletions eks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ You need to add the OIDC module as a dependency, since OAuth2-Proxy is deployed

The following requirements are needed by this module:

- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 4)
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)

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

Expand Down Expand Up @@ -287,7 +287,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v1.0.1"`
Default: `"v1.1.0"`

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

Expand Down Expand Up @@ -373,7 +373,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>> |>= 4
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
|[[requirement_null]] <<requirement_null,null>> |>= 3
|[[requirement_random]] <<requirement_random,random>> |>= 3
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
Expand Down Expand Up @@ -429,7 +429,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.1"`
|`"v1.1.0"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down
8 changes: 4 additions & 4 deletions kind/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ This module requires a S3 bucket to store the metrics so it needs to be deployed

The following requirements are needed by this module:

- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 4)
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)

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

Expand Down Expand Up @@ -221,7 +221,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v1.0.1"`
Default: `"v1.1.0"`

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

Expand Down Expand Up @@ -307,7 +307,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>> |>= 4
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
|[[requirement_null]] <<requirement_null,null>> |>= 3
|[[requirement_random]] <<requirement_random,random>> |>= 3
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
Expand Down Expand Up @@ -365,7 +365,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.1"`
|`"v1.1.0"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down
15 changes: 10 additions & 5 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,19 @@ resource "argocd_application" "this" {
}

sync_policy {
automated = var.app_autosync
automated {
prune = var.app_autosync.prune
self_heal = var.app_autosync.self_heal
allow_empty = var.app_autosync.allow_empty
}

retry {
backoff = {
duration = ""
max_duration = ""
backoff {
duration = "20s"
max_duration = "2m"
factor = "2"
}
limit = "0"
limit = "5"
}

sync_options = [
Expand Down
8 changes: 4 additions & 4 deletions sks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ This module requires a Persistent Volume so it needs to be deployed after the mo

The following requirements are needed by this module:

- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 4)
- [[requirement_argocd]] <<requirement_argocd,argocd>> (>= 5)

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

Expand Down Expand Up @@ -170,7 +170,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v1.0.1"`
Default: `"v1.1.0"`

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

Expand Down Expand Up @@ -256,7 +256,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>> |>= 4
|[[requirement_argocd]] <<requirement_argocd,argocd>> |>= 5
|[[requirement_null]] <<requirement_null,null>> |>= 3
|[[requirement_random]] <<requirement_random,random>> |>= 3
|[[requirement_utils]] <<requirement_utils,utils>> |>= 1
Expand Down Expand Up @@ -319,7 +319,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.1"`
|`"v1.1.0"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down
2 changes: 1 addition & 1 deletion terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
argocd = {
source = "oboukili/argocd"
version = ">= 4"
version = ">= 5"
}
utils = {
source = "cloudposse/utils"
Expand Down