From b3467a073d25df74a93e4e7e01e455afca21b39b Mon Sep 17 00:00:00 2001 From: Nupur Goyal Date: Fri, 3 Oct 2025 14:23:51 +0530 Subject: [PATCH 1/2] fixing version locator as per 3.1.0 version --- tools/access-management/permissions.sh | 5 ++--- tools/minimal-demo-prod-scripts/README.md | 2 +- .../catalog_values_demo_deployment.json | 2 +- .../catalog_values_minimal_deployment.json | 2 +- .../catalog_values_production_deployment.json | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/access-management/permissions.sh b/tools/access-management/permissions.sh index 82dc2052..6c09bdcc 100755 --- a/tools/access-management/permissions.sh +++ b/tools/access-management/permissions.sh @@ -223,7 +223,7 @@ if [ -n "$ACCESS_GROUP" ] && [ -z "$USER_EMAIL" ]; then existing_policies=$(ibmcloud iam access-group-policies "$ACCESS_GROUP" --output json 2>/dev/null || echo "[]") POLICY_ID=$(echo "$existing_policies" | jq -r ' .[] | - select(all(.resources[].attributes[]?.name; . != "serviceName")) | + select(any(.resources[].attributes[]?; .name == "serviceType" and .value == "service")) | .id' | head -n1) if [ -n "$POLICY_ID" ] && [ "$POLICY_ID" != "null" ]; then @@ -303,9 +303,8 @@ elif [ -z "$ACCESS_GROUP" ] && [ -n "$USER_EMAIL" ]; then existing_policies=$(ibmcloud iam user-policies "$USER_EMAIL" --output json 2>/dev/null || echo "[]") POLICY_ID=$(echo "$existing_policies" | jq -r ' .[] | - select(all(.resources[].attributes[]?.name; . != "serviceName")) | + select(any(.resources[].attributes[]?; .name == "serviceType" and .value == "service")) | .id' | head -n1) - if [ -n "$POLICY_ID" ] && [ "$POLICY_ID" != "null" ]; then EXISTING_ROLES=$(echo "$existing_policies" | jq -r --arg id "$POLICY_ID" ' .[] | select(.id == $id) | [.roles[].display_name] | join(",")') diff --git a/tools/minimal-demo-prod-scripts/README.md b/tools/minimal-demo-prod-scripts/README.md index 6d9dbdd8..f8be43af 100644 --- a/tools/minimal-demo-prod-scripts/README.md +++ b/tools/minimal-demo-prod-scripts/README.md @@ -39,7 +39,7 @@ SSH_KEY="SSH_KEY" TEMPLATE_FILE="catalog_values_minimal_deployment.json" # LSF tile version locator -LSF_TILE_VERSION="1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.2ad06fe1-6125-45c5-b8b6-6454eb4907e6-global" +LSF_TILE_VERSION="1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.92fba4af-b0dd-4b22-9415-9a5465ee9795-global" # App Center GUI password # Rules: Minimum 8 characters, at least 1 uppercase, 1 lowercase, 1 number, diff --git a/tools/minimal-demo-prod-scripts/catalog_values_demo_deployment.json b/tools/minimal-demo-prod-scripts/catalog_values_demo_deployment.json index cc8b3b79..b76993c4 100644 --- a/tools/minimal-demo-prod-scripts/catalog_values_demo_deployment.json +++ b/tools/minimal-demo-prod-scripts/catalog_values_demo_deployment.json @@ -31,7 +31,7 @@ "observability_monitoring_plan": "graduated-tier", "lsf_version": "fixpack_15", "vpc_name": "__NULL__", - "cluster_subnet_id": "__NULL__", + "compute_subnet_id": "__NULL__", "login_subnet_id": "__NULL__", "vpc_cidr": "10.241.0.0/18", "vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20", diff --git a/tools/minimal-demo-prod-scripts/catalog_values_minimal_deployment.json b/tools/minimal-demo-prod-scripts/catalog_values_minimal_deployment.json index d3cfe191..682386ca 100644 --- a/tools/minimal-demo-prod-scripts/catalog_values_minimal_deployment.json +++ b/tools/minimal-demo-prod-scripts/catalog_values_minimal_deployment.json @@ -31,7 +31,7 @@ "observability_monitoring_plan": "graduated-tier", "lsf_version": "fixpack_15", "vpc_name": "__NULL__", - "cluster_subnet_id": "__NULL__", + "compute_subnet_id": "__NULL__", "login_subnet_id": "__NULL__", "vpc_cidr": "10.241.0.0/18", "vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20", diff --git a/tools/minimal-demo-prod-scripts/catalog_values_production_deployment.json b/tools/minimal-demo-prod-scripts/catalog_values_production_deployment.json index 9acba7ab..3b1d37ca 100644 --- a/tools/minimal-demo-prod-scripts/catalog_values_production_deployment.json +++ b/tools/minimal-demo-prod-scripts/catalog_values_production_deployment.json @@ -31,7 +31,7 @@ "observability_monitoring_plan": "graduated-tier", "lsf_version": "fixpack_15", "vpc_name": "__NULL__", - "cluster_subnet_id": "__NULL__", + "compute_subnet_id": "__NULL__", "login_subnet_id": "__NULL__", "vpc_cidr": "10.241.0.0/18", "vpc_cluster_private_subnets_cidr_blocks": "10.241.0.0/20", From 97bf469d602cc77321a3c242eaf4dfc348eeef5f Mon Sep 17 00:00:00 2001 From: Nupur Goyal Date: Fri, 3 Oct 2025 14:38:12 +0530 Subject: [PATCH 2/2] fixing readme --- tools/minimal-demo-prod-scripts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/minimal-demo-prod-scripts/README.md b/tools/minimal-demo-prod-scripts/README.md index f8be43af..830125de 100644 --- a/tools/minimal-demo-prod-scripts/README.md +++ b/tools/minimal-demo-prod-scripts/README.md @@ -42,7 +42,7 @@ TEMPLATE_FILE="catalog_values_minimal_deployment.json" LSF_TILE_VERSION="1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.92fba4af-b0dd-4b22-9415-9a5465ee9795-global" # App Center GUI password -# Rules: Minimum 8 characters, at least 1 uppercase, 1 lowercase, 1 number, +# Rules: Minimum 15 characters, at least 1 uppercase, 1 lowercase, 1 number, # and 1 special character (!@#$%^&*()_+=-). No spaces allowed. APP_CENTER_GUI_PASSWORD="APP_CENTER_GUI_PASSWORD" ```