Skip to content

Commit a95490d

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
fix(deps): update dependencies (#63)
1 parent 3aa2953 commit a95490d

File tree

20 files changed

+233
-227
lines changed

20 files changed

+233
-227
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
call-terraform-ci-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.22.5
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
1212
secrets: inherit
1313
with:
1414
craSCCv2: true

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ on:
88

99
jobs:
1010
call-terraform-release-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.22.5
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
1212
secrets: inherit

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ For more information on access and permissions, see [IBM Cloud IAM service roles
7575
| Name | Version |
7676
|------|---------|
7777
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
78-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.1, <2.0.0 |
78+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.2, <2.0.0 |
7979

8080
### Modules
8181

‎chart/cloud-pak-deployer/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ deployer:
1212
cluster_role_name: "cluster-admin"
1313
accept_license_flag: ""
1414
admin_password: ""
15-
scc_name: "priveleged"
15+
scc_name: "privileged"
1616
image: "quay.io/cloud-pak-deployer/cloud-pak-deployer"
1717
job_name_suffix: ""
1818
entitlement_key: ""

‎common-dev-assets‎

‎examples/basic/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ locals {
1212

1313
module "resource_group" {
1414
source = "terraform-ibm-modules/resource-group/ibm"
15-
version = "1.2.1"
15+
version = "1.4.0"
1616
# if an existing resource group is not set (null) create a new one using prefix
1717
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
1818
existing_resource_group_name = var.resource_group
@@ -86,7 +86,7 @@ locals {
8686
module "ocp_base" {
8787
count = var.existing_cluster_name == null ? 1 : 0
8888
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
89-
version = "3.52.3"
89+
version = "3.70.0"
9090
resource_group_id = module.resource_group.resource_group_id
9191
region = var.region
9292
tags = var.resource_tags

‎examples/basic/version.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
# renovate is set up to keep provider version at the latest for all DA solutions
55
ibm = {
66
source = "ibm-cloud/ibm"
7-
version = "1.79.1"
7+
version = "1.79.2"
88
}
99
}
1010
}

‎modules/cloud-pak-deployer/main.tf‎

Lines changed: 68 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -26,80 +26,73 @@ resource "helm_release" "cloud_pak_deployer_helm_release" {
2626
cleanup_on_fail = false
2727
wait = true
2828

29-
set {
30-
name = "namespace"
31-
type = "string"
32-
value = local.cloud_pak_deployer.namespace_name
33-
}
34-
35-
set {
36-
name = "cluster_name"
37-
type = "string"
38-
value = replace(var.cluster_name, "-", "_")
39-
}
40-
41-
set {
42-
name = "deployer.configuration"
43-
type = "string"
44-
value = replace(yamlencode(var.cloud_pak_deployer_config), "\"", "")
45-
}
46-
47-
set {
48-
name = "deployer.job_name_suffix"
49-
type = "string"
50-
value = formatdate("hhmmss", timestamp())
51-
}
52-
53-
set {
54-
name = "deployer.accept_license_flag"
55-
type = "string"
56-
value = local.cloud_pak_deployer.script_accept_license_flag
57-
}
58-
59-
set {
60-
name = "deployer.image"
61-
type = "string"
62-
value = local.cloud_pak_deployer.image
63-
}
64-
65-
set {
66-
name = "createImagePullSecret"
67-
value = var.cloud_pak_deployer_secret != null ? true : false
68-
}
69-
70-
set {
71-
name = "imageCredentials.registry"
72-
type = "string"
73-
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "server", "") : ""
74-
}
75-
76-
set {
77-
name = "imageCredentials.username"
78-
type = "string"
79-
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "username", "") : ""
80-
}
81-
82-
set {
83-
name = "imageCredentials.email"
84-
type = "string"
85-
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "email", "") : ""
86-
}
87-
88-
set_sensitive {
89-
name = "deployer.entitlement_key"
90-
type = "string"
91-
value = var.cpd_entitlement_key
92-
}
29+
set = [
30+
{
31+
name = "namespace"
32+
type = "string"
33+
value = local.cloud_pak_deployer.namespace_name
34+
},
35+
{
36+
name = "cluster_name"
37+
type = "string"
38+
value = replace(var.cluster_name, "-", "_")
39+
},
40+
{
41+
name = "deployer.configuration"
42+
type = "string"
43+
value = replace(yamlencode(var.cloud_pak_deployer_config), "\"", "")
44+
},
45+
{
46+
name = "deployer.job_name_suffix"
47+
type = "string"
48+
value = formatdate("hhmmss", timestamp())
49+
},
50+
{
51+
name = "deployer.accept_license_flag"
52+
type = "string"
53+
value = local.cloud_pak_deployer.script_accept_license_flag
54+
},
55+
{
56+
name = "deployer.image"
57+
type = "string"
58+
value = local.cloud_pak_deployer.image
59+
},
60+
{
61+
name = "createImagePullSecret"
62+
value = var.cloud_pak_deployer_secret != null ? true : false
63+
},
64+
{
65+
name = "imageCredentials.registry"
66+
type = "string"
67+
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "server", "") : ""
68+
},
69+
{
70+
name = "imageCredentials.username"
71+
type = "string"
72+
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "username", "") : ""
73+
},
74+
{
75+
name = "imageCredentials.email"
76+
type = "string"
77+
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "email", "") : ""
78+
}
79+
]
9380

94-
set_sensitive {
95-
name = "deployer.admin_password"
96-
type = "string"
97-
value = var.cpd_admin_password
98-
}
99-
100-
set_sensitive {
101-
name = "imageCredentials.password"
102-
type = "string"
103-
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "password", "") : ""
104-
}
81+
set_sensitive = [
82+
{
83+
name = "deployer.entitlement_key"
84+
type = "string"
85+
value = var.cpd_entitlement_key
86+
},
87+
{
88+
name = "deployer.admin_password"
89+
type = "string"
90+
value = var.cpd_admin_password
91+
},
92+
{
93+
name = "imageCredentials.password"
94+
type = "string"
95+
value = var.cloud_pak_deployer_secret != null ? lookup(var.cloud_pak_deployer_secret, "password", "") : ""
96+
}
97+
]
10598
}

‎modules/cloud-pak-deployer/version.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
helm = {
55
source = "hashicorp/helm"
6-
version = ">= 2.8.0, <3.0.0"
6+
version = ">= 3.1.0, <4.0.0"
77
}
88
}
99
}

‎modules/cpd-image-build/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ module "build_image" {
2222
| Name | Version |
2323
|------|---------|
2424
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
25-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.1, <2.0.0 |
25+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.79.2, <2.0.0 |
2626
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.4.3, < 4.0.0 |
2727
| <a name="requirement_shell"></a> [shell](#requirement\_shell) | >= 1.7.10, <2.0.0 |
2828

2929
### Modules
3030

3131
| Name | Source | Version |
3232
|------|--------|---------|
33-
| <a name="module_code_engine"></a> [code\_engine](#module\_code\_engine) | terraform-ibm-modules/code-engine/ibm | 4.4.4 |
34-
| <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 |
33+
| <a name="module_code_engine"></a> [code\_engine](#module\_code\_engine) | terraform-ibm-modules/code-engine/ibm | 4.6.10 |
34+
| <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 |
3535

3636
### Resources
3737

0 commit comments

Comments
 (0)