Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions tools/access-management/permissions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(",")')
Expand Down
4 changes: 2 additions & 2 deletions tools/minimal-demo-prod-scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ 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"
Copy link
Contributor

Choose a reason for hiding this comment

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

@nupurg-ibm Can we bring this as an option for users ?

on the env file ? Assume there is two versions on the tile, 3.0.0 and 3.1.0.. So what ever the user wants they could provide the information.

I have already added a way of how to fetch this version locator on the docs. So users should be able to fetch them. Any thoughts ?


# 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"
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down