updates rally

Author: akocbek

ibm_catalog.json

@@ -1397,22 +1397,19 @@
             },
             {
               "role_crns": [
-                "crn:v1:bluemix:public:iam::::serviceRole:Writer"
-              ],
-              "service_name": "codeengine"
-            },
-            {
-              "role_crns": [
-                "crn:v1:bluemix:public:iam::::role:Editor"
+                "crn:v1:bluemix:public:iam::::serviceRole:Writer",
+                 "crn:v1:bluemix:public:iam::::role:Editor"
               ],
-              "service_name": "codeengine"
+              "service_name": "codeengine",
+              "notes": "Required for creating code engine."
             },
             {
               "role_crns": [
                 "crn:v1:bluemix:public:iam::::serviceRole:Writer",
                 "crn:v1:bluemix:public:iam::::role:Editor"
               ],
-              "service_name": "container-registry"
+              "service_name": "container-registry",
+              "notes": "Required for creating container registry namespaces."
             },
             {
               "service_name": "is",

solutions/fleets/main.tf

@@ -329,6 +329,7 @@ module "cloud_logs" {
   resource_group_id = module.resource_group.resource_group_id
   region            = var.region
   instance_name     = local.icl_name
+  resource_tags     = var.resource_tags
 }
 
 resource "ibm_iam_service_id" "logs_service_id" {
@@ -355,8 +356,8 @@ resource "ibm_iam_service_policy" "logs_policy" {
 ########################################################################################################################
 locals {
   enable_cloud_monitoring = var.cloud_monitoring_plan == "none" ? false : true
-  monitoring_name         = "${local.prefix}-sysdig"
-  monitoring_key_name     = "${local.prefix}-sysdig-key"
+  monitoring_name         = "${local.prefix}sysdig"
+  monitoring_key_name     = "${local.prefix}sysdig-key"
 }
 
 module "cloud_monitoring" {
@@ -370,6 +371,7 @@ module "cloud_monitoring" {
   service_endpoints       = "public-and-private"
   enable_platform_metrics = false
   manager_key_name        = local.monitoring_key_name
+  resource_tags           = var.resource_tags
 }
 
 
@@ -395,7 +397,7 @@ locals {
       "data" = {
         password = var.ibmcloud_api_key,
         username = "iamapikey",
-        server   = "us.icr.io"
+        server   = local.container_registry
       }
     }
   }
@@ -460,3 +462,28 @@ module "secret" {
   # Issue with provider, service_access is not supported at the moment. https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5232
   # service_access = each.value.service_access
 }
+
+##############################################################################
+# Container Registry
+##############################################################################
+locals {
+  registry_region_result = data.external.container_registry_region.result
+  registry               = lookup(local.registry_region_result, "registry", null)
+  container_registry     = local.registry != null ? "private.${local.registry}" : null
+  registry_region_error  = lookup(local.registry_region_result, "error", null)
+
+  # This will cause Terraform to fail if "error" is present in the external script output executed as a part of container_registry_region
+  # tflint-ignore: terraform_unused_declarations
+  fail_if_registry_region_error = local.registry_region_error != null ? tobool("Registry region script failed: ${local.registry_region_error}") : null
+}
+
+# get the container registry endpoint according to the region
+data "external" "container_registry_region" {
+  program = ["bash", "../../scripts/get-cr-region.sh"]
+
+  query = {
+    RESOURCE_GROUP_ID = module.resource_group.resource_group_id
+    REGION            = var.region
+    IBMCLOUD_API_KEY  = var.ibmcloud_api_key
+  }
+}

solutions/fleets/outputs.tf

@@ -58,19 +58,16 @@ output "vpc_name" {
 }
 
 output "next_steps_text" {
-  value       = "Now, visit the Code Engine project URL to verify secrets, network configurations, and ensure readiness for workload deployment."
+  value       = "Now, visit the documentation to learn how to run a serverless fleet using Code Engine."
   description = "Next steps text"
 }
 
 output "next_step_primary_label" {
-  value       = "Go to Code Engine Project"
+  value       = "Learn how to run a serverless fleet"
   description = "Primary label"
 }
 
 output "next_step_primary_url" {
-  value       = "https://cloud.ibm.com/containers/serverless/project/${var.region}/${module.project.id}/overview"
+  value       = "https://github.com/IBM/CodeEngine/blob/main/beta/serverless-fleets/README.md#launch-a-fleet"
   description = "primary url"
 }
-
-
-