Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c218a03
fix: updated vpc catalog and reference architecture
Apr 17, 2025
545d7ee
update catalog
Apr 24, 2025
de0c296
update catalog
Apr 24, 2025
91cb838
Merge branch 'main' into issue_13328
Khuzaima05 Apr 24, 2025
636948a
update catalog
Apr 24, 2025
500571b
fix arch
Apr 24, 2025
3c7257a
fix arch
Apr 24, 2025
bf01b9f
update code
Apr 29, 2025
ce3bd6d
Merge branch 'main' into issue_13328
maheshwarishikha May 6, 2025
0f38163
updated overview and features
May 6, 2025
260ffcd
update code
May 6, 2025
cd166bb
fix code
May 6, 2025
e4fac04
prefix doc
May 7, 2025
6c64fe8
Update DA-prefix.md
vburckhardt May 8, 2025
6e38d55
update desc
May 14, 2025
60ea805
Merge branch 'main' into issue_13328
maheshwarishikha May 14, 2025
0ed9271
fix typo
May 14, 2025
fda9879
Merge branch 'main' into issue_13328
maheshwarishikha May 15, 2025
da45086
Migrate dependencies for VPC
May 20, 2025
b558470
Merge branch 'main' into issue_13500
Khuzaima05 May 20, 2025
bc79039
update ref_arch
May 21, 2025
8767202
update ref_arch
May 21, 2025
8d77ad6
fix cos mapping
May 22, 2025
be35a28
update cos version
May 22, 2025
236d3eb
update cos version
May 22, 2025
25c2f5a
fix kms
May 22, 2025
3057fc3
resolve review comments
May 26, 2025
4470bc2
Merge branch 'main' into issue_13500
Khuzaima05 May 26, 2025
7c63e2a
updated kms add-on
May 27, 2025
382e238
updated kms description
May 27, 2025
b716367
Merge branch 'main' into issue_13328
Khuzaima05 May 29, 2025
57852d5
minor fix
May 29, 2025
5d1daa2
update architecture description
May 30, 2025
f76f9af
delete prefix.md
May 30, 2025
9c6ecac
added catalog changes
May 30, 2025
63bab0c
resolve review comments
Jun 2, 2025
3f2e0e1
updated description
Jun 2, 2025
5074270
updated label
Jun 2, 2025
e8fee5a
Update ibm_catalog.json
Khuzaima05 Jun 2, 2025
f7973b5
Update ibm_catalog.json
Khuzaima05 Jun 2, 2025
718d0c5
fix minor issues
Jun 4, 2025
eaba50d
Merge branch 'issue_13500' of github.com:terraform-ibm-modules/terraf…
Jun 4, 2025
c519c11
updated observability permission
Jun 4, 2025
fb79fba
updated descriptions in catalog config
Jun 4, 2025
1e27526
update ref arch and catalog json
Jun 9, 2025
a84e931
Merge branch 'main' into issue_13500
maheshwarishikha Jun 9, 2025
917ddc1
update provider version
Jun 9, 2025
0c9bd2e
fix provider version and pre-commit failure
Jun 10, 2025
dd2c2f6
SKIP UPGRADE TEST
Jun 11, 2025
b175266
updated provider version
Jun 11, 2025
078ce31
updated add-ons version
Jun 11, 2025
10e23cc
updated obervability mapping
Jun 11, 2025
5f4c393
update dependencies version
Jun 11, 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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ To attach access management tags to resources in this module, you need the follo
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.59.0, < 2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.79.0, < 2.0.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |

### Modules
Expand Down
6 changes: 3 additions & 3 deletions cra-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
version: "v1"
CRA_TARGETS:
- CRA_TARGET: "examples/default" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
- CRA_TARGET: "solutions/fully-configurable" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" # CRA Ignore file to use. If not provided, it checks the repo root directory for `cra-tf-validate-ignore-rules.json`
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
TF_VAR_region: "us-south"
TF_VAR_prefix: "def-slz-vpc"
TF_VAR_provider_visibility: "public"
TF_VAR_prefix: "vpc-fc"
2 changes: 1 addition & 1 deletion examples/basic/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# module's version.tf (basic), and 1 example that will always use the latest provider version.
ibm = {
source = "IBM-Cloud/ibm"
version = "1.59.0"
version = ">=1.59.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/specific-zone-only/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.59.0"
version = ">=1.59.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/vpc-with-dns/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.59.0"
version = ">=1.59.0"
}
}
}
294 changes: 135 additions & 159 deletions ibm_catalog.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion images/vpc_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion reference-architecture/deployable-architecture-vpc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading