Skip to content

fix(deps): update dependencies #63

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 3, 2025
Merged

fix(deps): update dependencies #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e174e
fix(deps): update dependencies
terraform-ibm-modules-ops Nov 3, 2025
5cf1a9f
changes required to move to helm v3 provider
ocofaigh Nov 3, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
call-terraform-ci-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.22.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
secrets: inherit
with:
craSCCv2: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.22.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
secrets: inherit
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ For more information on access and permissions, see [IBM Cloud IAM service roles
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.1, <2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.2, <2.0.0 |

### Modules

Expand Down
2 changes: 1 addition & 1 deletion chart/cloud-pak-deployer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ deployer:
cluster_role_name: "cluster-admin"
accept_license_flag: ""
admin_password: ""
scc_name: "priveleged"
scc_name: "privileged"
image: "quay.io/cloud-pak-deployer/cloud-pak-deployer"
job_name_suffix: ""
entitlement_key: ""
Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
Open in desktop
Submodule common-dev-assets updated 2 files
+1 −1 commonRenovateConfig.json
+39 −31 module-assets/ci/install-deps.sh
4 changes: 2 additions & 2 deletions examples/basic/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.4.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 @@ -86,7 +86,7 @@ locals {
module "ocp_base" {
count = var.existing_cluster_name == null ? 1 : 0
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.52.3"
version = "3.70.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
tags = var.resource_tags
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# renovate is set up to keep provider version at the latest for all DA solutions
ibm = {
source = "ibm-cloud/ibm"
version = "1.79.1"
version = "1.79.2"
}
}
}
143 changes: 68 additions & 75 deletions modules/cloud-pak-deployer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,80 +26,73 @@ resource "helm_release" "cloud_pak_deployer_helm_release" {
cleanup_on_fail = false
wait = true

set {
name = "namespace"
type = "string"
value = local.cloud_pak_deployer.namespace_name
}

set {
name = "cluster_name"
type = "string"
value = replace(var.cluster_name, "-", "_")
}

set {
name = "deployer.configuration"
type = "string"
value = replace(yamlencode(var.cloud_pak_deployer_config), "\"", "")
}

set {
name = "deployer.job_name_suffix"
type = "string"
value = formatdate("hhmmss", timestamp())
}

set {
name = "deployer.accept_license_flag"
type = "string"
value = local.cloud_pak_deployer.script_accept_license_flag
}

set {
name = "deployer.image"
type = "string"
value = local.cloud_pak_deployer.image
}

set {
name = "createImagePullSecret"
value = var.cloud_pak_deployer_secret != null ? true : false
}

set {
name = "imageCredentials.registry"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "server", "") : ""
}

set {
name = "imageCredentials.username"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "username", "") : ""
}

set {
name = "imageCredentials.email"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "email", "") : ""
}

set_sensitive {
name = "deployer.entitlement_key"
type = "string"
value = var.cpd_entitlement_key
}
set = [
{
name = "namespace"
type = "string"
value = local.cloud_pak_deployer.namespace_name
},
{
name = "cluster_name"
type = "string"
value = replace(var.cluster_name, "-", "_")
},
{
name = "deployer.configuration"
type = "string"
value = replace(yamlencode(var.cloud_pak_deployer_config), "\"", "")
},
{
name = "deployer.job_name_suffix"
type = "string"
value = formatdate("hhmmss", timestamp())
},
{
name = "deployer.accept_license_flag"
type = "string"
value = local.cloud_pak_deployer.script_accept_license_flag
},
{
name = "deployer.image"
type = "string"
value = local.cloud_pak_deployer.image
},
{
name = "createImagePullSecret"
value = var.cloud_pak_deployer_secret != null ? true : false
},
{
name = "imageCredentials.registry"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "server", "") : ""
},
{
name = "imageCredentials.username"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "username", "") : ""
},
{
name = "imageCredentials.email"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "email", "") : ""
}
]

set_sensitive {
name = "deployer.admin_password"
type = "string"
value = var.cpd_admin_password
}

set_sensitive {
name = "imageCredentials.password"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "password", "") : ""
}
set_sensitive = [
{
name = "deployer.entitlement_key"
type = "string"
value = var.cpd_entitlement_key
},
{
name = "deployer.admin_password"
type = "string"
value = var.cpd_admin_password
},
{
name = "imageCredentials.password"
type = "string"
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "password", "") : ""
}
]
}
2 changes: 1 addition & 1 deletion modules/cloud-pak-deployer/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
helm = {
source = "hashicorp/helm"
version = ">= 2.8.0, <3.0.0"
version = ">= 3.1.0, <4.0.0"
}
}
}
6 changes: 3 additions & 3 deletions modules/cpd-image-build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ module "build_image" {
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.1, <2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.2, <2.0.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.4.3, < 4.0.0 |
| <a name="requirement_shell"></a> [shell](#requirement\_shell) | >= 1.7.10, <2.0.0 |

### Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_code_engine"></a> [code\_engine](#module\_code\_engine) | terraform-ibm-modules/code-engine/ibm | 4.4.4 |
| <a name="module_code_engine_build"></a> [code\_engine\_build](#module\_code\_engine\_build) | terraform-ibm-modules/code-engine/ibm//modules/build | 4.4.4 |
| <a name="module_code_engine"></a> [code\_engine](#module\_code\_engine) | terraform-ibm-modules/code-engine/ibm | 4.6.10 |
| <a name="module_code_engine_build"></a> [code\_engine\_build](#module\_code\_engine\_build) | terraform-ibm-modules/code-engine/ibm//modules/build | 4.6.10 |

### Resources

Expand Down
20 changes: 11 additions & 9 deletions modules/cpd-image-build/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ data "ibm_code_engine_project" "code_engine_project" {

module "code_engine" {
source = "terraform-ibm-modules/code-engine/ibm"
version = "4.4.4"
version = "4.6.10"
project_name = var.code_engine_project_id == null ? var.code_engine_project_name : null
existing_project_id = var.code_engine_project_id
resource_group_id = var.code_engine_project_id != null ? data.ibm_code_engine_project.code_engine_project[0].resource_group_id : local.resource_group_id
Expand All @@ -75,15 +75,17 @@ module "code_engine" {

module "code_engine_build" {
source = "terraform-ibm-modules/code-engine/ibm//modules/build"
version = "4.4.4"
version = "4.6.10"

name = "cpd-build"
project_id = module.code_engine.project_id
output_image = local.container_registry_output_image
output_secret = "registry-secret" # pragma: allowlist secret
source_url = "https://github.com/IBM/cloud-pak-deployer"
source_revision = var.cloud_pak_deployer_release
strategy_type = "dockerfile"
ibmcloud_api_key = var.ibmcloud_api_key
existing_resource_group_id = local.resource_group_id
name = "cpd-build"
project_id = module.code_engine.project_id
output_image = local.container_registry_output_image
output_secret = "registry-secret" # pragma: allowlist secret
source_url = "https://github.com/IBM/cloud-pak-deployer"
source_revision = var.cloud_pak_deployer_release
strategy_type = "dockerfile"

depends_on = [module.code_engine]
}
Expand Down
2 changes: 1 addition & 1 deletion modules/cpd-image-build/scripts/image-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ while [ "${i}" -lt "${NUMBER_OF_RETRIES}" ]; do
done

if [ "${COMPLETE}" = false ]; then
echo "The build run did not complete in the alloted time. Output = ${BUILD_RUN_OUTPUT}"
echo "The build run did not complete in the allotted time. Output = ${BUILD_RUN_OUTPUT}"
exit 1;
fi

Expand Down
2 changes: 1 addition & 1 deletion modules/cpd-image-build/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
ibm = {
source = "ibm-cloud/ibm"
version = ">=1.79.1, <2.0.0"
version = ">=1.79.2, <2.0.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

module "cluster_resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.2.1"
version = "1.4.0"
existing_resource_group_name = var.existing_cluster_resource_group_name
}

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.3.0"
version = "1.4.0"
existing_resource_group_name = var.existing_resource_group_name
}

Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ provider "shell" {
}

provider "helm" {
kubernetes {
kubernetes = {
host = data.ibm_container_cluster_config.cluster_config.host
token = data.ibm_container_cluster_config.cluster_config.token
}
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ terraform {
required_providers {
ibm = {
source = "ibm-cloud/ibm"
version = "1.80.4"
version = "1.84.3"
}
external = {
source = "hashicorp/external"
version = "2.3.5"
}
helm = {
source = "hashicorp/helm"
version = "2.17.0"
version = "3.1.0"
}
shell = {
source = "scottwinkler/shell"
Expand Down
Loading