Skip to content

Commit 55508e7

Browse files
Merge branch 'main' into regex
2 parents 2df666c + 9c99447 commit 55508e7

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Primary owner should be listed first in list of global owners, followed by any secondary owners
2-
* @vbontempi @daniel-butler-irl
2+
* @vbontempi @vkuma17

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- created
88
jobs:
99
call-terraform-ci-pipeline:
10-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
10+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.0
1111
secrets: inherit
1212
with:
1313
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.23.2
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.0
1212
secrets: inherit

examples/all-combined/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ module "network_acl" {
186186
# OCP CLUSTER creation
187187
module "ocp_base" {
188188
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
189-
version = "3.71.4"
189+
version = "3.72.0"
190190
cluster_name = "${var.prefix}-vpc"
191191
resource_group_id = module.resource_group.resource_group_id
192192
region = var.region

examples/basic/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ module "network_acl" {
198198
# OCP CLUSTER creation
199199
module "ocp_base" {
200200
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
201-
version = "3.71.4"
201+
version = "3.72.0"
202202
cluster_name = "${var.prefix}-vpc"
203203
resource_group_id = module.resource_group.resource_group_id
204204
region = var.region

tests/existing-resources/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ module "network_acl" {
184184
# OCP CLUSTER creation
185185
module "ocp_base" {
186186
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
187-
version = "3.71.4"
187+
version = "3.72.0"
188188
cluster_name = "${var.prefix}-vpc"
189189
resource_group_id = module.resource_group.resource_group_id
190190
region = var.region

tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ toolchain go1.25.4
77
require (
88
github.com/gruntwork-io/terratest v0.52.0
99
github.com/stretchr/testify v1.11.1
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.24
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.25
1111
gopkg.in/yaml.v3 v3.0.1
12-
k8s.io/apimachinery v0.34.1
12+
k8s.io/apimachinery v0.34.2
1313
)
1414

1515
require (

tests/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
452452
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
453453
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
454454
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
455-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.24 h1:zGpk1bZ+QEReLHxFGWHIyrpYcVtYVqcCu5VnTy5UHQM=
456-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.24/go.mod h1:jHtWTYnTCdD/mP/uP4c3EP52ey47mjVuoiSrbzOwr0c=
455+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.25 h1:hQWI1Ekpyuxkc5Gcw/vihl/O9FcLcOaC/AnR6Zlr8iI=
456+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.25/go.mod h1:jHtWTYnTCdD/mP/uP4c3EP52ey47mjVuoiSrbzOwr0c=
457457
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
458458
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
459459
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=
@@ -708,8 +708,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
708708
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
709709
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
710710
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
711-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
712-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
711+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
712+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
713713
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
714714
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
715715
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)