Skip to content

Commit 069a99b

Browse files
nupurg-ibmNupur Goyal
andauthored
fixing SML version locator as per 3.1.0 version (#284)
* fixing SML version locator as per 3.1.0 version --------- Co-authored-by: Nupur Goyal <[email protected]>
1 parent ca6e2cc commit 069a99b

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

tools/access-management/permissions.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ if [ -n "$ACCESS_GROUP" ] && [ -z "$USER_EMAIL" ]; then
223223
existing_policies=$(ibmcloud iam access-group-policies "$ACCESS_GROUP" --output json 2>/dev/null || echo "[]")
224224
POLICY_ID=$(echo "$existing_policies" | jq -r '
225225
.[] |
226-
select(all(.resources[].attributes[]?.name; . != "serviceName")) |
226+
select(any(.resources[].attributes[]?; .name == "serviceType" and .value == "service")) |
227227
.id' | head -n1)
228228

229229
if [ -n "$POLICY_ID" ] && [ "$POLICY_ID" != "null" ]; then
@@ -303,9 +303,8 @@ elif [ -z "$ACCESS_GROUP" ] && [ -n "$USER_EMAIL" ]; then
303303
existing_policies=$(ibmcloud iam user-policies "$USER_EMAIL" --output json 2>/dev/null || echo "[]")
304304
POLICY_ID=$(echo "$existing_policies" | jq -r '
305305
.[] |
306-
select(all(.resources[].attributes[]?.name; . != "serviceName")) |
306+
select(any(.resources[].attributes[]?; .name == "serviceType" and .value == "service")) |
307307
.id' | head -n1)
308-
309308
if [ -n "$POLICY_ID" ] && [ "$POLICY_ID" != "null" ]; then
310309
EXISTING_ROLES=$(echo "$existing_policies" | jq -r --arg id "$POLICY_ID" '
311310
.[] | select(.id == $id) | [.roles[].display_name] | join(",")')

tools/minimal-demo-prod-scripts/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ SSH_KEY="SSH_KEY"
3939
TEMPLATE_FILE="catalog_values_minimal_deployment.json"
4040
4141
# LSF tile version locator
42-
LSF_TILE_VERSION="1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.2ad06fe1-6125-45c5-b8b6-6454eb4907e6-global"
42+
LSF_TILE_VERSION="1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.92fba4af-b0dd-4b22-9415-9a5465ee9795-global"
4343
4444
# App Center GUI password
45-
# Rules: Minimum 8 characters, at least 1 uppercase, 1 lowercase, 1 number,
45+
# Rules: Minimum 15 characters, at least 1 uppercase, 1 lowercase, 1 number,
4646
# and 1 special character (!@#$%^&*()_+=-). No spaces allowed.
4747
APP_CENTER_GUI_PASSWORD="APP_CENTER_GUI_PASSWORD"
4848
```

tools/minimal-demo-prod-scripts/catalog_values_demo_deployment.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"observability_monitoring_plan": "graduated-tier",
3232
"lsf_version": "fixpack_15",
3333
"vpc_name": "__NULL__",
34-
"cluster_subnet_id": "__NULL__",
34+
"compute_subnet_id": "__NULL__",
3535
"login_subnet_id": "__NULL__",
3636
"vpc_cidr": "10.241.0.0/18",
3737
"vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20",

tools/minimal-demo-prod-scripts/catalog_values_minimal_deployment.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"observability_monitoring_plan": "graduated-tier",
3232
"lsf_version": "fixpack_15",
3333
"vpc_name": "__NULL__",
34-
"cluster_subnet_id": "__NULL__",
34+
"compute_subnet_id": "__NULL__",
3535
"login_subnet_id": "__NULL__",
3636
"vpc_cidr": "10.241.0.0/18",
3737
"vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20",

tools/minimal-demo-prod-scripts/catalog_values_production_deployment.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"observability_monitoring_plan": "graduated-tier",
3232
"lsf_version": "fixpack_15",
3333
"vpc_name": "__NULL__",
34-
"cluster_subnet_id": "__NULL__",
34+
"compute_subnet_id": "__NULL__",
3535
"login_subnet_id": "__NULL__",
3636
"vpc_cidr": "10.241.0.0/18",
3737
"vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20",

0 commit comments

Comments
 (0)