Skip to content
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ To configure a set of tenants to be configured in their proper namespace (to ach
```hcl
module "external_secrets_operator" {
source = "terraform-ibm-modules/external-secrets-operator/ibm"
version = "1.0.0"
version = <<the latest version of the module>>
eso_namespace = var.eso_namespace # namespace to deploy ESO
service_endpoints = var.service_endpoints # use public or private endpoints for IAM and Secrets Manager
eso_cluster_nodes_configuration = <<the eso configuration for specific cluster nodes selection if needed - read above>>
Expand Down Expand Up @@ -516,11 +516,11 @@ You need the following permissions to run this module.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_eso_chart_location"></a> [eso\_chart\_location](#input\_eso\_chart\_location) | The location of the External Secrets Operator Helm chart. | `string` | `"https://charts.external-secrets.io"` | no |
| <a name="input_eso_chart_version"></a> [eso\_chart\_version](#input\_eso\_chart\_version) | The version of the External Secrets Operator Helm chart. Ensure that the chart version is compatible with the image version specified in eso\_image\_version. | `string` | `"0.19.0"` | no |
| <a name="input_eso_chart_version"></a> [eso\_chart\_version](#input\_eso\_chart\_version) | The version of the External Secrets Operator Helm chart. Ensure that the chart version is compatible with the image version specified in eso\_image\_version. | `string` | `"0.19.1"` | no |
| <a name="input_eso_cluster_nodes_configuration"></a> [eso\_cluster\_nodes\_configuration](#input\_eso\_cluster\_nodes\_configuration) | Configuration to use to customise ESO deployment on specific cluster nodes. Setting appropriate values will result in customising ESO helm release. Default value is null to keep ESO standard deployment. | <pre>object({<br/> nodeSelector = object({<br/> label = string<br/> value = string<br/> })<br/> tolerations = object({<br/> key = string<br/> operator = string<br/> value = string<br/> effect = string<br/> })<br/> })</pre> | `null` | no |
| <a name="input_eso_enroll_in_servicemesh"></a> [eso\_enroll\_in\_servicemesh](#input\_eso\_enroll\_in\_servicemesh) | Flag to enroll ESO into istio servicemesh | `bool` | `false` | no |
| <a name="input_eso_image"></a> [eso\_image](#input\_eso\_image) | The External Secrets Operator image in the format of `[registry-url]/[namespace]/[image]`. | `string` | `"ghcr.io/external-secrets/external-secrets"` | no |
| <a name="input_eso_image_version"></a> [eso\_image\_version](#input\_eso\_image\_version) | The version or digest for the external secrets image to deploy. If changing the value, ensure it is compatible with the chart version set in eso\_chart\_version. | `string` | `"v0.17.0-ubi@sha256:5c9f7750fb922fb09cfc3b430d5916923b85f17ba5099b244173344ab3046b53"` | no |
| <a name="input_eso_image_version"></a> [eso\_image\_version](#input\_eso\_image\_version) | The version or digest for the external secrets image to deploy. If changing the value, ensure it is compatible with the chart version set in eso\_chart\_version. | `string` | `"v0.19.1-ubi@sha256:dcdefcf74cdbef5dd55678d4672b9fec290d133059d38639642382c4c17666d9"` | no |
| <a name="input_eso_namespace"></a> [eso\_namespace](#input\_eso\_namespace) | Namespace to create and be used to install ESO components including helm releases. | `string` | `null` | no |
| <a name="input_eso_pod_configuration"></a> [eso\_pod\_configuration](#input\_eso\_pod\_configuration) | Configuration to use to customise ESO deployment on specific pods. Setting appropriate values will result in customising ESO helm release. Default value is {} to keep ESO standard deployment. Ignore the key if not required. | <pre>object({<br/> annotations = optional(object({<br/> # The annotations for external secret controller pods.<br/> external_secrets = optional(map(string), {})<br/> # The annotations for external secret cert controller pods.<br/> external_secrets_cert_controller = optional(map(string), {})<br/> # The annotations for external secret controller pods.<br/> external_secrets_webhook = optional(map(string), {})<br/> }), {})<br/><br/> labels = optional(object({<br/> # The labels for external secret controller pods.<br/> external_secrets = optional(map(string), {})<br/> # The labels for external secret cert controller pods.<br/> external_secrets_cert_controller = optional(map(string), {})<br/> # The labels for external secret controller pods.<br/> external_secrets_webhook = optional(map(string), {})<br/> }), {})<br/> })</pre> | `{}` | no |
| <a name="input_existing_eso_namespace"></a> [existing\_eso\_namespace](#input\_existing\_eso\_namespace) | Existing Namespace to be used to install ESO components including helm releases. | `string` | `null` | no |
Expand Down
6 changes: 3 additions & 3 deletions examples/all-combined/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.3.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -186,7 +186,7 @@ module "network_acl" {
# OCP CLUSTER creation
module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.53.0"
version = "3.55.1"
cluster_name = "${var.prefix}-vpc"
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down Expand Up @@ -231,7 +231,7 @@ data "ibm_cis" "cis_instance" {

module "vpes" {
source = "terraform-ibm-modules/vpe-gateway/ibm"
version = "4.7.0"
version = "4.7.5"
count = var.service_endpoints == "private" ? 1 : 0
region = var.region
prefix = "vpe"
Expand Down
4 changes: 2 additions & 2 deletions examples/all-combined/privatecertificate.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ locals {
# private certificate engine
module "secrets_manager_private_secret_engine" {
source = "terraform-ibm-modules/secrets-manager-private-cert-engine/ibm"
version = "1.6.4"
version = "1.6.6"
secrets_manager_guid = local.sm_guid
region = local.sm_region
root_ca_name = var.pvt_ca_name != null ? var.pvt_ca_name : "pvt-${var.prefix}-project-root-ca"
Expand All @@ -30,7 +30,7 @@ module "secrets_manager_private_secret_engine" {
module "secrets_manager_private_certificate" {
depends_on = [module.secrets_manager_private_secret_engine]
source = "terraform-ibm-modules/secrets-manager-private-cert/ibm"
version = "1.4.1"
version = "1.4.4"
cert_name = "${var.prefix}-sm-private-cert"
cert_description = "Private certificate for ${local.pvt_cert_common_name}"
cert_secrets_group_id = module.secrets_manager_group.secret_group_id
Expand Down
4 changes: 2 additions & 2 deletions examples/all-combined/publiccertificate.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
module "secrets_manager_public_cert_engine" {
count = (var.acme_letsencrypt_private_key != null || (var.acme_letsencrypt_private_key_sm_id != null && var.acme_letsencrypt_private_key_secret_id != null && var.acme_letsencrypt_private_key_sm_region != null)) ? 1 : 0
source = "terraform-ibm-modules/secrets-manager-public-cert-engine/ibm"
version = "1.1.7"
version = "1.1.9"
secrets_manager_guid = local.sm_guid
region = local.sm_region
internet_services_crn = data.ibm_cis.cis_instance.id
Expand Down Expand Up @@ -36,7 +36,7 @@ module "secrets_manager_public_certificate" {
count = (var.acme_letsencrypt_private_key != null || (var.acme_letsencrypt_private_key_sm_id != null && var.acme_letsencrypt_private_key_secret_id != null && var.acme_letsencrypt_private_key_sm_region != null)) ? 1 : 0
depends_on = [module.secrets_manager_public_cert_engine]
source = "terraform-ibm-modules/secrets-manager-public-cert/ibm"
version = "1.3.1"
version = "1.4.0"
cert_common_name = local.cert_common_name
cert_description = "Certificate for ${local.cert_common_name}"
cert_name = "${var.prefix}-sm-public-cert"
Expand Down
4 changes: 2 additions & 2 deletions examples/all-combined/secretsmanager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ resource "ibm_resource_instance" "secrets_manager" {
# create secrets group for secrets
module "secrets_manager_group" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = "${var.prefix}-secret-group" #checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand All @@ -49,7 +49,7 @@ module "secrets_manager_group" {
# additional secrets manager secret group for service level secrets
module "secrets_manager_group_acct" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
#tfsec:ignore:general-secrets-no-plaintext-exposure
Expand Down
2 changes: 1 addition & 1 deletion examples/all-combined/tpauth_cluster_sstore.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# creating a secrets group for clustersecretstore with trustedprofile auth
module "tp_clusterstore_secrets_manager_group" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = "${var.prefix}-cpstore-tp-secret-group" #checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down
8 changes: 4 additions & 4 deletions examples/all-combined/tpauth_namespaced_sstore.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module "eso_tp_namespace_secretstores" {
# creating a secrets group for each namespace to be used for namespaced secretstores with trustedprofile auth
module "tp_secrets_manager_groups" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
count = length(var.es_namespaces_tp)
region = local.sm_region
secrets_manager_guid = local.sm_guid
Expand Down Expand Up @@ -140,7 +140,7 @@ module "eso_tp_namespace_secretstore_multisg" {
# creating two secrets groups for a single namespace to test trusted profile policy on multiple secrets groups
module "tp_secrets_manager_group_multi_1" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = "${var.prefix}-tp-secret-group-multisg-1" #checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand All @@ -152,7 +152,7 @@ module "tp_secrets_manager_group_multi_1" {

module "tp_secrets_manager_group_multi_2" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = "${var.prefix}-tp-secret-group-multisg-21" #checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down Expand Up @@ -285,7 +285,7 @@ module "eso_tp_namespace_secretstore_nosecgroup" {
# creating secrets group for a single namespace to test trusted profile policy without any secret group in the TP policy
module "tp_secrets_manager_group_not_for_policy" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = "${var.prefix}-tp-secret-group-not-for-policy" #checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down
6 changes: 3 additions & 3 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.3.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -198,7 +198,7 @@ module "network_acl" {
# OCP CLUSTER creation
module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.53.0"
version = "3.55.1"
cluster_name = "${var.prefix}-vpc"
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down Expand Up @@ -267,7 +267,7 @@ resource "ibm_resource_instance" "secrets_manager" {
# Additional Secrets-Manager Secret-Group for SERVICE level secrets
module "secrets_manager_group_acct" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
#tfsec:ignore:general-secrets-no-plaintext-exposure
Expand Down
6 changes: 3 additions & 3 deletions examples/trusted-profiles-authentication/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.3.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -41,7 +41,7 @@ resource "ibm_resource_instance" "secrets_manager" {

module "secrets_manager_groups" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
count = length(kubernetes_namespace.examples)
region = local.sm_region
secrets_manager_guid = local.sm_guid
Expand Down Expand Up @@ -166,7 +166,7 @@ module "external_secrets" {

module "vpes" {
source = "terraform-ibm-modules/vpe-gateway/ibm"
version = "4.7.0"
version = "4.7.5"
count = var.service_endpoints == "private" ? 1 : 0
region = var.region
prefix = "vpe"
Expand Down
8 changes: 4 additions & 4 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ module "cluster_secrets_stores_service_secrets_groups" {
for idx, element in local.cluster_secrets_stores_service_secrets_groups_list : element.key => element
})
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = each.value.name # checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down Expand Up @@ -167,7 +167,7 @@ module "cluster_secrets_stores_account_secrets_groups" {
} if(cluster_secrets_store.existing_account_secrets_group_id == null || cluster_secrets_store.existing_account_secrets_group_id == "") && cluster_secrets_store.account_secrets_group_name != null
})
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = each.value.name # checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down Expand Up @@ -366,7 +366,7 @@ module "secrets_stores_service_secrets_groups" {
for idx, element in local.secrets_stores_service_secrets_groups_list : element.key => element
})
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = each.value.name # checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down Expand Up @@ -426,7 +426,7 @@ module "secrets_stores_account_secrets_groups" {
} if(secrets_store.existing_account_secrets_group_id == null || secrets_store.existing_account_secrets_group_id == "") && secrets_store.account_secrets_group_name != null
})
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.11"
version = "1.3.13"
region = local.sm_region
secrets_manager_guid = local.sm_guid
secret_group_name = each.value.name # checkov:skip=CKV_SECRET_6: does not require high entropy string as is static value
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ variable "eso_image" {
variable "eso_image_version" {
type = string
description = "The version or digest for the external secrets image to deploy. If changing the value, ensure it is compatible with the chart version set in eso_chart_version."
default = "v0.17.0-ubi@sha256:5c9f7750fb922fb09cfc3b430d5916923b85f17ba5099b244173344ab3046b53" # datasource: ghcr.io/external-secrets/external-secrets
default = "v0.19.1-ubi@sha256:dcdefcf74cdbef5dd55678d4672b9fec290d133059d38639642382c4c17666d9" # datasource: ghcr.io/external-secrets/external-secrets
nullable = false
validation {
condition = can(regex("(^v\\d+\\.\\d+.\\d+(\\-\\w+)?(\\@sha256\\:\\w+){0,1})$", var.eso_image_version))
Expand All @@ -163,7 +163,7 @@ variable "eso_chart_location" {
variable "eso_chart_version" {
type = string
description = "The version of the External Secrets Operator Helm chart. Ensure that the chart version is compatible with the image version specified in eso_image_version."
default = "0.19.0" # registryUrl: charts.external-secrets.io
default = "0.19.1" # registryUrl: charts.external-secrets.io
nullable = false
}

Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ terraform {
}
ibm = {
source = "IBM-Cloud/ibm"
version = "1.80.4"
version = "1.81.1"
}
}
}
4 changes: 2 additions & 2 deletions tests/existing-resources/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.3.0"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down Expand Up @@ -184,7 +184,7 @@ module "network_acl" {
# OCP CLUSTER creation
module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.53.0"
version = "3.55.1"
cluster_name = "${var.prefix}-vpc"
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down
Loading