Skip to content

Commit 2da02d9

Browse files
NatarajBTINatarajBTI
authored
feat: Manage channel version updated to v9.0.x<br>- Updated to MAS CLI release version 11.1.0<br>- storage_class_rwx has been updated to ibmc-vpc-file-500-iops<br>- sls_license_id has been remoed - no longer required<br>- support added for OCP 4.15 provided outbound traffic is allowed (by default it is disabled in 4.15. It is also now recommended to use vpc-file-csi-driver addon version 2.0) (#167)
BREAKING CHANGE: No upgrade path supported from previous version
1 parent b5e2a90 commit 2da02d9

File tree

13 files changed

+41
-90
lines changed

13 files changed

+41
-90
lines changed

‎README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module "maximo" {
5151
entitlement_key = var.entitlement_key
5252
mas_instance_id = var.mas_instance_id # For example, inst1
5353
mas_license = var.mas_license
54-
sls_license_id = var.sls_license_id
5554
contact_email = var.contact_email
5655
contact_firstname = var.contact_firstname
5756
contact_lastname = var.contact_lastname
@@ -60,7 +59,7 @@ module "maximo" {
6059
mas_workspace_name = var.mas_workspace_name # For example, wrkns1
6160
pipeline_storage_class = var.pipeline_storage_class # For example, ibmc-vpc-block-retain-10iops-tier
6261
storage_class_rwo = var.storage_class_rwo # For example, ibmc-vpc-block-retain-10iops-tier
63-
storage_class_rwx = var.storage_class_rwx # For example, ibmc-vpc-file-dp2 (file storage required for db2)
62+
storage_class_rwx = var.storage_class_rwx # For example, ibmc-vpc-file-500-iops (file storage required for db2)
6463
6564
}
6665
```
@@ -114,9 +113,8 @@ No modules.
114113
| <a name="input_mas_workspace_id"></a> [mas\_workspace\_id](#input\_mas\_workspace\_id) | Enter the Maximo Application Suite workspace Id. | `string` | `"wrkid1"` | no |
115114
| <a name="input_mas_workspace_name"></a> [mas\_workspace\_name](#input\_mas\_workspace\_name) | Enter the Maximo Application Suite workspace name | `string` | `"wrkns1"` | no |
116115
| <a name="input_pipeline_storage_class"></a> [pipeline\_storage\_class](#input\_pipeline\_storage\_class) | Enter the storage class for pipeline. Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-block-retain-10iops-tier"` | no |
117-
| <a name="input_sls_license_id"></a> [sls\_license\_id](#input\_sls\_license\_id) | Enter Suite License Server license ID. A unique 12-character hexadecimal value in the first line of your Maximo Application Suite license key file. For example, SERVER sls-rlks-0.rlks 0242ac110002 27000, where the 12-character hexadecimal value is 0242ac110002. You can use an existing secret in Secrets Manager or add your entitlement key directly. | `string` | n/a | yes |
118116
| <a name="input_storage_class_rwo"></a> [storage\_class\_rwo](#input\_storage\_class\_rwo) | Enter the storage class (read-write once). Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-block-retain-10iops-tier"` | no |
119-
| <a name="input_storage_class_rwx"></a> [storage\_class\_rwx](#input\_storage\_class\_rwx) | Enter the storage class (read-write many). Enter file storage class for DB2. Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-file-dp2"` | no |
117+
| <a name="input_storage_class_rwx"></a> [storage\_class\_rwx](#input\_storage\_class\_rwx) | Enter the storage class (read-write many). Enter file storage class for DB2. Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-file-500-iops"` | no |
120118

121119
### Outputs
122120

‎chart/deploy-mas/templates/01-deploy-mas.yaml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ spec:
7676
runAsNonRoot: true
7777
containers:
7878
- name: {{ $job_name }}
79-
# 8.0.0-pre.master - sha256:5b5222caecdd860840fd1eb070999e29ed356310474741f76934d0a9f8921d99
80-
# below sha is for quay.io/ibmmas/cli:8.0.0-pre.mascore-2054 (tag 8.0.0), update it once we get a new release tag
81-
image: quay.io/ibmmas/cli@sha256:9f6e76d8c303e4838159959a6c54f00ac1c6710ef1c87ebd60a38d0642e99ec5
79+
# Using MAS CLI release version 11.1.0
80+
image: quay.io/ibmmas/cli@sha256:9df66d5a0bd46a7340831a16daac207e2c733df015bbaeff821c8001d32d773a
8281
imagePullPolicy: Always
8382
securityContext:
8483
readOnlyRootFilesystem: {{ $readonly_root_filesystem }}
@@ -116,7 +115,6 @@ spec:
116115
echo "MAS_WORKSPACE_NAME=${MAS_WORKSPACE_NAME}"
117116
echo "MAS_CATALOG_VERSION=${MAS_CATALOG_VERSION}"
118117
echo "MAS_CHANNEL=${MAS_CHANNEL}"
119-
echo "SLS_LICENSE_ID=${SLS_LICENSE_ID}"
120118
##echo "SLS_LICENSE_FILE_LOCAL=${SLS_LICENSE_FILE_LOCAL}"
121119
echo "CONTACT_EMAIL=${CONTACT_EMAIL}"
122120
echo "CONTACT_FIRSTNAME=${CONTACT_FIRSTNAME}"
@@ -147,31 +145,31 @@ spec:
147145
mas install -i "${MAS_INSTANCE_ID}" -w "${MAS_WORKSPACE_ID}" \
148146
-W "${MAS_WORKSPACE_NAME}" -c "${MAS_CATALOG_VERSION}" \
149147
--mas-channel "${MAS_CHANNEL}" --ibm-entitlement-key "${ENTITLEMENT_KEY}" \
150-
--license-id "${SLS_LICENSE_ID}" --license-file "${SLS_LICENSE_FILE_LOCAL}" \
148+
--license-file "${SLS_LICENSE_FILE_LOCAL}" \
151149
--uds-email "${CONTACT_EMAIL}" --uds-firstname "${CONTACT_FIRSTNAME}" \
152-
--uds-lastname "${CONTACT_LASTNAME}" --storage-rwx "${STORAGE_CLASS_RWX}" \
150+
--uds-lastname "${CONTACT_LASTNAME}" --storage-class-rwx "${STORAGE_CLASS_RWX}" --storage-class-rwo "${STORAGE_CLASS_RWO}" \
153151
--storage-pipeline "${PIPELINE_STORAGE_CLASS}" --storage-accessmode "${PIPELINE_STORAGE_ACCESSMODE}" \
154-
--no-confirm --no-wait-for-pvcs --accept-license
152+
--no-confirm --no-wait-for-pvc --accept-license
155153
156154
elif [ "${DEPLOYMENT_FLAVOR}" == "manage" ]; then
157155
echo "Core+Manage installation started"
158156
159157
mas install -i "${MAS_INSTANCE_ID}" -w "${MAS_WORKSPACE_ID}" \
160158
-W "${MAS_WORKSPACE_NAME}" -c "${MAS_CATALOG_VERSION}" \
161159
--mas-channel "${MAS_CHANNEL}" --ibm-entitlement-key ${ENTITLEMENT_KEY} \
162-
--license-id "${SLS_LICENSE_ID}" --license-file "${SLS_LICENSE_FILE_LOCAL}" \
160+
--license-file "${SLS_LICENSE_FILE_LOCAL}" \
163161
--uds-email "${CONTACT_EMAIL}" --uds-firstname "${CONTACT_FIRSTNAME}" \
164-
--uds-lastname "${CONTACT_LASTNAME}" --storage-rwx "${STORAGE_CLASS_RWX}" --storage-rwo "${STORAGE_CLASS_RWO}" \
162+
--uds-lastname "${CONTACT_LASTNAME}" --storage-class-rwx "${STORAGE_CLASS_RWX}" --storage-class-rwo "${STORAGE_CLASS_RWO}" \
165163
--storage-pipeline "${PIPELINE_STORAGE_CLASS}" --storage-accessmode "${PIPELINE_STORAGE_ACCESSMODE}" \
166-
--manage-channel "${MANAGE_CHANNEL}" \
164+
--manage-channel "${MANAGE_CHANNEL}" --manage-server-bundle-size "dev" \
167165
--manage-jdbc "${MANAGE_JDBC_CONFIG_SCOPE}" --manage-components "${MANAGE_COMPONENTS}" \
168-
--db2u-channel "${DB2U_CHANNEL}" --db2u-manage \
169-
--db2u-cpu-request "${DB2U_CPU_REQUEST}" --db2u-cpu-limit "${DB2U_CPU_LIMIT}" \
170-
--db2u-memory-request "${DB2U_MEMORY_REQUEST}" --db2u-memory-limit "${DB2U_MEMORY_LIMIT}" \
171-
--db2u-backup-storage "${DB2U_BACKUP_STORAGE}" --db2u-data-storage "${DB2U_DATA_STORAGE}" \
172-
--db2u-logs-storage "${DB2U_LOGS_STORAGE}" --db2u-meta-storage "${DB2U_META_STORAGE}" \
173-
--db2u-temp-storage "${DB2U_TEMP_STORAGE}" \
174-
--no-confirm --no-wait-for-pvcs --accept-license
166+
--db2-channel "${DB2U_CHANNEL}" --db2-manage \
167+
--db2-cpu-request "${DB2U_CPU_REQUEST}" --db2-cpu-limit "${DB2U_CPU_LIMIT}" \
168+
--db2-memory-request "${DB2U_MEMORY_REQUEST}" --db2-memory-limit "${DB2U_MEMORY_LIMIT}" \
169+
--db2-backup-storage "${DB2U_BACKUP_STORAGE}" --db2-data-storage "${DB2U_DATA_STORAGE}" \
170+
--db2-logs-storage "${DB2U_LOGS_STORAGE}" --db2-meta-storage "${DB2U_META_STORAGE}" \
171+
--db2-temp-storage "${DB2U_TEMP_STORAGE}" \
172+
--no-confirm --no-wait-for-pvc --accept-license
175173
176174
else
177175
echo "Passed DEPLOYMENT_FLAVOR not supported, Supported values = core, mange"
@@ -190,9 +188,6 @@ spec:
190188
value: "{{ .Values.mas_catalog_version }}"
191189
- name: MAS_CHANNEL
192190
value: "{{ .Values.mas_channel }}"
193-
194-
- name: SLS_LICENSE_ID
195-
value: "{{ .Values.sls_license_id }}"
196191
- name: CONTACT_EMAIL
197192
value: "{{ .Values.contact_email }}"
198193
- name: CONTACT_FIRSTNAME

‎chart/deploy-mas/templates/02-uninstall-pre-delete.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ spec:
7979
type: RuntimeDefault
8080
containers:
8181
- name: {{ $job_name }}
82-
# 8.0.0-pre.master - sha256:5b5222caecdd860840fd1eb070999e29ed356310474741f76934d0a9f8921d99
83-
# below sha is for quay.io/ibmmas/cli:8.0.0-pre.mascore-2054 (tag 8.0.0), update it once we get a new release tag
84-
image: quay.io/ibmmas/cli@sha256:9f6e76d8c303e4838159959a6c54f00ac1c6710ef1c87ebd60a38d0642e99ec5
82+
# Using MAS CLI release version 11.1.0
83+
image: quay.io/ibmmas/cli@sha256:9df66d5a0bd46a7340831a16daac207e2c733df015bbaeff821c8001d32d773a
8584

8685
imagePullPolicy: Always
8786
securityContext:
@@ -120,7 +119,6 @@ spec:
120119
echo "MAS_WORKSPACE_NAME=${MAS_WORKSPACE_NAME}"
121120
echo "MAS_CATALOG_VERSION=${MAS_CATALOG_VERSION}"
122121
echo "MAS_CHANNEL=${MAS_CHANNEL}"
123-
echo "SLS_LICENSE_ID=${SLS_LICENSE_ID}"
124122
##echo "SLS_LICENSE_FILE_LOCAL=${SLS_LICENSE_FILE_LOCAL}"
125123
echo "CONTACT_EMAIL=${CONTACT_EMAIL}"
126124
echo "CONTACT_FIRSTNAME=${CONTACT_FIRSTNAME}"
@@ -150,7 +148,7 @@ spec:
150148
varstr=$(oc get namespaces | grep mas-"${MAS_INSTANCE_ID}"-core | awk -F' ' '{print $2}')
151149
if [[ $varstr == "Active" ]]; then
152150
echo "MAS instance namespace found"
153-
mas uninstall -i "${MAS_INSTANCE_ID}" --no-confirm
151+
mas uninstall --mas-instance-id "${MAS_INSTANCE_ID}" --uninstall-all-deps --uninstall-cert-manager --uninstall-common-services --uninstall-grafana --uninstall-ibm-catalog --uninstall-mongodb --uninstall-sls --uninstall-uds --no-confirm
154152
for (( i=0; i<=15; i++ ));
155153
do
156154
varstr2=$(oc get pr -n mas-${MAS_INSTANCE_ID}-pipelines | grep uninstall | awk -F' ' '{print $3}')
@@ -176,7 +174,7 @@ spec:
176174
varstr=$(oc get namespaces | grep mas-"${MAS_INSTANCE_ID}"-core | awk -F' ' '{print $2}')
177175
if [[ $varstr == "Active" ]]; then
178176
echo "MAS instance namespace found"
179-
mas uninstall -i "${MAS_INSTANCE_ID}" --no-confirm
177+
mas uninstall --mas-instance-id "${MAS_INSTANCE_ID}" --uninstall-all-deps --uninstall-cert-manager --uninstall-common-services --uninstall-grafana --uninstall-ibm-catalog --uninstall-mongodb --uninstall-sls --uninstall-uds --no-confirm
180178
for (( i=0; i<=15; i++ ));
181179
do
182180
varstr2=$(oc get pr -n mas-${MAS_INSTANCE_ID}-pipelines | grep uninstall | awk -F' ' '{print $3}')

‎chart/deploy-mas/values.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@
22
mas_instance_id:
33
mas_workspace_id:
44
mas_workspace_name:
5-
mas_catalog_version: v8-amd64
6-
mas_channel: 8.11.x
7-
sls_license_id: replace
5+
mas_catalog_version: v9-240827-amd64
6+
mas_channel: 9.0.x
87
contact_email:
98
contact_firstname:
109
contact_lastname:
1110
storage_class_rwo: ibmc-vpc-block-retain-10iops-tier
12-
storage_class_rwx:
11+
storage_class_rwx: ibmc-vpc-file-500-iops
1312
pipeline_storage_class: ibmc-vpc-block-retain-10iops-tier
1413
pipeline_storage_accessmode: ReadWriteOnce
1514
entitlement_key:
1615
mas_license: replace
1716
deployment_flavor:
1817

1918
# manage specific
20-
manage_channel: 8.7.x
19+
manage_channel: 9.0.x
2120
manage_jdbc_config_scope: workspace-application
2221
manage_components: "base=latest,health=latest"
23-
db2u_channel: "v110508.0"
24-
db2u_cpu_request: 4000m
25-
db2u_cpu_limit: 6000m
26-
db2u_memory_request: 8Gi
27-
db2u_memory_limit: 12Gi
28-
db2u_backup_storage: 100Gi
29-
db2u_data_storage: 100Gi
30-
db2u_logs_storage: 100Gi
31-
db2u_meta_storage: 20Gi
32-
db2u_temp_storage: 100Gi
22+
db2_channel: "v110509.0"
23+
db2_cpu_request: 4000m
24+
db2_cpu_limit: 6000m
25+
db2_memory_request: 8Gi
26+
db2_memory_limit: 12Gi
27+
db2_backup_storage: 100Gi
28+
db2_data_storage: 100Gi
29+
db2_logs_storage: 100Gi
30+
db2_meta_storage: 20Gi
31+
db2_temp_storage: 100Gi
3332
readonly_root_filesystem: "false"

‎examples/basic/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module "mas_core" {
77
cluster_id = var.cluster_id
88
entitlement_key = var.entitlement_key
99
mas_license = var.mas_license
10-
sls_license_id = var.sls_license_id
1110
deployment_flavor = "core"
1211
mas_instance_id = "inst1"
1312
contact_email = "test@ibm.com"

‎examples/basic/variables.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ variable "mas_license" {
3232
sensitive = true
3333
}
3434

35-
variable "sls_license_id" {
36-
type = string
37-
description = "Enter Suite License Server license ID. A unique 12-character hexadecimal value in the first line of your Maximo Application Suite license key file. For example, SERVER sls-rlks-0.rlks 0242ac110002 27000, where the 12-character hexadecimal value is 0242ac110002. You can use an existing secret in Secrets Manager or add your entitlement key directly."
38-
sensitive = true
39-
nullable = false
40-
}
41-
4235
variable "cluster_config_endpoint_type" {
4336
description = "Specify which type of endpoint to use for for cluster config access: 'default', 'private', 'vpe', 'link'. 'default' value will use the default endpoint of the cluster."
4437
type = string

‎main.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ resource "helm_release" "maximo_helm_release" {
1919
value = base64encode(var.mas_license)
2020
}
2121

22-
set_sensitive {
23-
name = "sls_license_id"
24-
type = "string"
25-
value = var.sls_license_id
26-
}
27-
2822
set {
2923
name = "deployment_flavor"
3024
type = "string"

‎override-json-file/override.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"clusters": [
99
{
1010
"addons": {
11-
"vpc-file-csi-driver": "1.2"
11+
"vpc-file-csi-driver": "2.0"
1212
},
1313
"boot_volume_crk_name": "roks-key",
1414
"cos_name": "cos",
@@ -18,7 +18,7 @@
1818
"private_endpoint": true
1919
},
2020
"kube_type": "openshift",
21-
"kube_version": "4.14_openshift",
21+
"kube_version": "4.15_openshift",
2222
"machine_type": "bx2.16x64",
2323
"manage_all_addons": false,
2424
"name": "workload-cluster",
@@ -33,7 +33,8 @@
3333
"worker_pools": [
3434
],
3535
"workers_per_subnet": 1,
36-
"disable_public_endpoint": false
36+
"disable_public_endpoint": false,
37+
"disable_outbound_traffic_protection": true
3738
}
3839
],
3940
"cos": [

‎solutions/existing-cluster/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
| <a name="input_mas_workspace_name"></a> [mas\_workspace\_name](#input\_mas\_workspace\_name) | Enter the Maximo Application Suite workspace name | `string` | `"wrkns1"` | no |
4848
| <a name="input_pipeline_storage_class"></a> [pipeline\_storage\_class](#input\_pipeline\_storage\_class) | Enter the storage class for pipeline. Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-block-retain-10iops-tier"` | no |
4949
| <a name="input_region"></a> [region](#input\_region) | Enter region of the target IBM Cloud Red Hat OpenShift Cluster | `string` | n/a | yes |
50-
| <a name="input_sls_license_id"></a> [sls\_license\_id](#input\_sls\_license\_id) | Enter Suite License Server license ID. A unique 12-character hexadecimal value in the first line of your Maximo Application Suite license key file. For example, SERVER sls-rlks-0.rlks 0242ac110002 27000, where the 12-character hexadecimal value is 0242ac110002. You can use an existing secret in Secrets Manager or add your entitlement key directly. | `string` | n/a | yes |
5150
| <a name="input_storage_class_rwo"></a> [storage\_class\_rwo](#input\_storage\_class\_rwo) | Enter the storage class (read-write once). Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-block-retain-10iops-tier"` | no |
5251
| <a name="input_storage_class_rwx"></a> [storage\_class\_rwx](#input\_storage\_class\_rwx) | Enter the storage class (read-write many). Enter file storage class for DB2. Default value is ibmc-vpc-block-retain-10iops-tier. Make sure this storage class is present under Storage > StorageClasses section on your Red Hat OpenShift cluster section. | `string` | `"ibmc-vpc-block-retain-10iops-tier"` | no |
5352

‎solutions/existing-cluster/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module "existing_cluster" {
55
entitlement_key = var.entitlement_key
66
mas_instance_id = var.mas_instance_id
77
mas_license = var.mas_license
8-
sls_license_id = var.sls_license_id
98
contact_email = var.contact_email
109
contact_firstname = var.contact_firstname
1110
contact_lastname = var.contact_lastname

0 commit comments

Comments
 (0)