Add Kconfig.image.generated to generate_cloud_configs.py

Teach "make cloud-config" and "make cloud-config-oci" to update the
Kconfig.image menu with dynamically discovered information. This
information is based on what resources are available to the user's
tenancy and region subscription.

This support is intended to work like the reference implementation
under terraform/lambdalabs/

Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

.gitignore

@@ -122,6 +122,7 @@ terraform/aws/kconfigs/Kconfig.instance.generated
 terraform/aws/kconfigs/Kconfig.location.generated
 terraform/aws/scripts/__pycache__/
 
+terraform/oci/kconfigs/Kconfig.image.generated
 terraform/oci/kconfigs/Kconfig.location.generated
 terraform/oci/kconfigs/Kconfig.shape.generated
 terraform/oci/scripts/__pycache__/

scripts/dynamic-cloud-kconfig.Makefile

@@ -22,10 +22,11 @@ AWS_KCONFIGS := $(AWS_KCONFIG_AMI) $(AWS_KCONFIG_INSTANCE) $(AWS_KCONFIG_LOCATIO
 
 # OCI dynamic configuration
 OCI_KCONFIG_DIR := terraform/oci/kconfigs
+OCI_KCONFIG_IMAGE := $(OCI_KCONFIG_DIR)/Kconfig.image.generated
 OCI_KCONFIG_LOCATION := $(OCI_KCONFIG_DIR)/Kconfig.location.generated
 OCI_KCONFIG_SHAPE := $(OCI_KCONFIG_DIR)/Kconfig.shape.generated
 
-OCI_KCONFIGS := $(OCI_KCONFIG_LOCATION) $(OCI_KCONFIG_SHAPE)
+OCI_KCONFIGS := $(OCI_KCONFIG_IMAGE) $(OCI_KCONFIG_LOCATION) $(OCI_KCONFIG_SHAPE)
 
 # Add generated files to mrproper clean list
 KDEVOPS_MRPROPER += $(LAMBDALABS_KCONFIGS) $(AWS_KCONFIGS) $(OCI_KCONFIGS)

scripts/generate_cloud_configs.py

@@ -159,6 +159,7 @@ def generate_oci_kconfig() -> bool:
 
     # Define the script-to-output mapping
     scripts_to_run = [
+        ("gen_kconfig_image", "Kconfig.image.generated"),
         ("gen_kconfig_location", "Kconfig.location.generated"),
         ("gen_kconfig_shape", "Kconfig.shape.generated"),
     ]

terraform/oci/Kconfig

@@ -13,7 +13,7 @@ menu "Compute"
 comment "Shape selection"
 source "terraform/oci/kconfigs/Kconfig.shape.generated"
 comment "OS image selection"
-source "terraform/oci/kconfigs/Kconfig.image"
+source "terraform/oci/kconfigs/Kconfig.image.generated"
 endmenu
 menu "Storage"
 source "terraform/oci/kconfigs/Kconfig.storage"