Skip to content

fix: Image build fix #10

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

Closed
wants to merge 10 commits into from
Closed

fix: Image build fix #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b231ef4
fix: add token for build script
argeiger Jan 28, 2025
e2bc1eb
fix: add token for build script
argeiger Jan 28, 2025
7a1305b
fix: add token for build script
argeiger Jan 28, 2025
ba0a088
fix: add sleep
Feb 4, 2025
b6c9a90
fix: add sleep
Feb 4, 2025
ce68cf0
fix: add sleep
Feb 4, 2025
6133834
SKIP UPGRADE TESTS
Feb 4, 2025
2dfefef
Merge branch 'main' into image-build-fix
jor2 Apr 24, 2025
81bb9f3
Merge branch 'main' into image-build-fix
jor2 Apr 27, 2025
fdea2c6
Merge branch 'main' into image-build-fix
jor2 Apr 28, 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
15 changes: 13 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-02-11T22:49:03Z",
"generated_at": "2025-01-28T19:05:06Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -76,7 +76,18 @@
"name": "TwilioKeyDetector"
}
],
"results": {},
"results": {
"solutions/deploy/README.md": [
{
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
"is_secret": false,
"is_verified": false,
"line_number": 136,
"type": "Secret Keyword",
"verified_result": null
}
]
},
"version": "0.13.1+ibm.62.dss",
"word_list": {
"file": null,
Expand Down
6 changes: 6 additions & 0 deletions examples/basic/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ module "ocp_base" {
disable_outbound_traffic_protection = true # set as True to enable outbound traffic
}

resource "time_sleep" "wait_5_minutes" {
depends_on = [module.roks_landing_zone]

destroy_duration = "300s"
}
Copy link
Contributor

@ocofaigh ocofaigh Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jor2 I see the sleep as a temp workaround - we still need to figure out what resource(s) are taking time to clean up. I suspect the cluster is creating something (maybe a load balancer).
When we figure out what is taking time, we should include the details in the code comment (or link to a git issue with the details)


##############################################################################
# Deploy cloudpak_data
##############################################################################
Expand Down
6 changes: 5 additions & 1 deletion examples/basic/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
terraform {
required_version = ">= 1.3"
required_providers {
# renovate is set up to keep provider version at the latest for all DA solutions
# renovate is set up to keep provider version at the latest for all DA solutions.
ibm = {
source = "ibm-cloud/ibm"
version = "1.71.3"
}
time = {
source = "hashicorp/time"
version = ">= 0.9.1, < 1.0.0"
}
}
}
6 changes: 3 additions & 3 deletions solutions/deploy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ You need the following permissions to run this module:
|------|------|
| [ibm_container_addons.odf_cluster_addon](https://registry.terraform.io/providers/ibm-cloud/ibm/1.71.3/docs/resources/container_addons) | resource |
| [external_external.schematics](https://registry.terraform.io/providers/hashicorp/external/latest/docs/data-sources/external) | data source |
| [ibm_container_cluster_config.cluster_config](https://registry.terraform.io/providers/ibm-cloud/ibm/1.71.3/docs/data-sources/container_cluster_config) | data source |
| [ibm_container_vpc_cluster.cluster_info](https://registry.terraform.io/providers/ibm-cloud/ibm/1.71.3/docs/data-sources/container_vpc_cluster) | data source |
| [ibm_iam_auth_token.tokendata](https://registry.terraform.io/providers/ibm-cloud/ibm/1.71.3/docs/data-sources/iam_auth_token) | data source |
| [ibm_container_cluster_config.cluster_config](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_cluster_config) | data source |
| [ibm_container_vpc_cluster.cluster_info](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_vpc_cluster) | data source |
| [ibm_iam_auth_token.tokendata](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/iam_auth_token) | data source |

### Inputs

Expand Down