Skip to content

Commit b231ef4

Browse files
committed
fix: add token for build script
1 parent 5eb0682 commit b231ef4

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

.secrets.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-01-24T16:49:18Z",
6+
"generated_at": "2025-01-28T19:05:06Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
8282
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
8383
"is_secret": false,
8484
"is_verified": false,
85-
"line_number": 134,
85+
"line_number": 136,
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
}

chart/cloud-pak-deployer/templates/install-job.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ spec:
7373
- '/cloud-pak-deployer/cp-deploy.sh vault set -vs cp4d_admin_cpd_{{ .Values.cluster_name }} -vsv {{ .Values.deployer.admin_password }} && /cloud-pak-deployer/cp-deploy.sh env apply -vvvv {{ .Values.deployer.accept_license_flag }}'
7474
resources:
7575
limits:
76-
cpu: 200m
76+
cpu: 250m
7777
memory: 512Mi
7878
requests:
79-
cpu: 10m
80-
memory: 64Mi
79+
cpu: 100m
80+
memory: 100Mi
8181
serviceAccount: {{ .Values.deployer.prefix }}-sa
8282
volumes:
8383
- name: config-volume

solutions/deploy/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ You need the following permissions to run this module:
105105
| <a name="requirement_external"></a> [external](#requirement\_external) | >= 2.3.4 |
106106
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.8.0, <3.0.0 |
107107
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.66.0, < 2.0.0 |
108+
| <a name="requirement_shell"></a> [shell](#requirement\_shell) | 1.7.10 |
108109

109110
### Modules
110111

@@ -124,13 +125,14 @@ You need the following permissions to run this module:
124125
| [external_external.schematics](https://registry.terraform.io/providers/hashicorp/external/latest/docs/data-sources/external) | data source |
125126
| [ibm_container_cluster_config.cluster_config](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_cluster_config) | data source |
126127
| [ibm_container_vpc_cluster.cluster_info](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/container_vpc_cluster) | data source |
128+
| [ibm_iam_auth_token.tokendata](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/iam_auth_token) | data source |
127129

128130
### Inputs
129131

130132
| Name | Description | Type | Default | Required |
131133
|------|-------------|------|---------|:--------:|
132134
| <a name="input_cloud_pak_deployer_image"></a> [cloud\_pak\_deployer\_image](#input\_cloud\_pak\_deployer\_image) | Cloud Pak Deployer image location. If not defined, it will build the image via code engine | `string` | `null` | no |
133-
| <a name="input_cloud_pak_deployer_release"></a> [cloud\_pak\_deployer\_release](#input\_cloud\_pak\_deployer\_release) | Release of Cloud Pak Deployer version to use. View releases at: https://github.com/IBM/cloud-pak-deployer/releases. | `string` | `"v3.1.2"` | no |
135+
| <a name="input_cloud_pak_deployer_release"></a> [cloud\_pak\_deployer\_release](#input\_cloud\_pak\_deployer\_release) | Release of Cloud Pak Deployer version to use. View releases at: https://github.com/IBM/cloud-pak-deployer/releases. | `string` | `"v3.1.3"` | no |
134136
| <a name="input_cloud_pak_deployer_secret"></a> [cloud\_pak\_deployer\_secret](#input\_cloud\_pak\_deployer\_secret) | Image pull secret for the cloud pak deployer image | <pre>object({<br/> username = string<br/> password = string<br/> server = string<br/> email = string<br/> })</pre> | `null` | no |
135137
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of Red Hat OpenShift cluster to install watsonx onto | `string` | n/a | yes |
136138
| <a name="input_code_engine_project_id"></a> [code\_engine\_project\_id](#input\_code\_engine\_project\_id) | If you want to use an existing project, you can pass the code engine project id and the cloud pak deployer build will be built within the existing project vs a new one being created. | `string` | `null` | no |

solutions/deploy/providers.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ data "ibm_container_cluster_config" "cluster_config" {
99
config_dir = local.kube_config_dir
1010
}
1111

12+
data "ibm_iam_auth_token" "tokendata" {}
13+
14+
provider "shell" {
15+
sensitive_environment = {
16+
TOKEN = data.ibm_iam_auth_token.tokendata.iam_access_token
17+
}
18+
}
19+
1220
provider "helm" {
1321
kubernetes {
1422
host = data.ibm_container_cluster_config.cluster_config.host

solutions/deploy/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ variable "cloud_pak_deployer_image" {
5252
variable "cloud_pak_deployer_release" {
5353
description = "Release of Cloud Pak Deployer version to use. View releases at: https://github.com/IBM/cloud-pak-deployer/releases."
5454
type = string
55-
default = "v3.1.2"
55+
default = "v3.1.3"
5656
}
5757

5858
variable "cloud_pak_deployer_secret" {

solutions/deploy/version.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,9 @@ terraform {
1313
source = "hashicorp/helm"
1414
version = ">= 2.8.0, <3.0.0"
1515
}
16+
shell = {
17+
source = "scottwinkler/shell"
18+
version = "1.7.10"
19+
}
1620
}
1721
}

0 commit comments

Comments
 (0)