@@ -54,12 +54,14 @@ const (
5454 peerpodsCMAzureImageKey = "AZURE_IMAGE_ID"
5555 peerpodsCMGCPImageKey = "PODVM_IMAGE_NAME"
5656 peerpodsLibvirtImageKey = "LIBVIRT_IMAGE_ID"
57+ peerpodsCMIBMCloudImageKey = "IBMCLOUD_PODVM_IMAGE_ID"
5758 fipsCMKey = "BOOT_FIPS"
5859 procFIPS = "/proc/sys/crypto/fips_enabled"
5960 AWSProvider = "aws"
6061 AzureProvider = "azure"
6162 GCPProvider = "gcp"
6263 LibvirtProvider = "libvirt"
64+ IBMCloudProvider = "ibmcloud"
6365 peerpodsImageJobsPathLocation = "/config/peerpods/podvm"
6466 azureImageGalleryPrefix = "PodVMGallery"
6567)
@@ -259,6 +261,9 @@ func newImageGenerator(client client.Client) (*ImageGenerator, error) {
259261 igLogger .Info ("libvirt is our provider" , "provider" , provider )
260262 ig .CMimageIDKey = peerpodsLibvirtImageKey
261263 ig .provider = provider
264+ case IBMCloudProvider :
265+ ig .provider = provider
266+ ig .CMimageIDKey = peerpodsCMIBMCloudImageKey
262267 default :
263268 igLogger .Info ("unsupported cloud provider, image creation/deletion will be disabled" , "provider" , ig .provider )
264269 ig .provider = unsupportedCloudProvider
@@ -415,6 +420,7 @@ func (r *ImageGenerator) getPeerPodsCM() (*corev1.ConfigMap, error) {
415420// azure-podvm-image-cm.yaml for Azure
416421// aws-podvm-image-cm.yaml for AWS
417422// libvirt-podvm-image-cm.yaml for Libvirt
423+ // ibmcloud-podvm-image-cm.yaml for IBM Cloud
418424
419425func (r * ImageGenerator ) imageCreateJobRunner () (int , error ) {
420426 igLogger .Info ("imageCreateJobRunner: Start" )
@@ -617,6 +623,10 @@ func (r *ImageGenerator) validatePeerPodsConfigs() error {
617623 libvirtSecretKeys := []string {"CLOUD_PROVIDER" , "LIBVIRT_URI" }
618624 // libvirt ConfigMap Keys
619625 libvirtConfigMapKeys := []string {"CLOUD_PROVIDER" , "LIBVIRT_POOL" , "LIBVIRT_VOL_NAME" , "LIBVIRT_DIR_NAME" }
626+ // ibmcloud Secret Keys
627+ ibmcloudSecretKeys := []string {"IBMCLOUD_IAM_PROFILE_ID" , "IBMCLOUD_API_KEY" }
628+ // ibmcloud ConfigMap Keys
629+ ibmcloudConfigMapKeys := []string {"CLOUD_PROVIDER" }
620630
621631 // Check for each cloud provider if respective ConfigMap keys are present in the peerPodsConfigMap
622632 switch r .provider {
@@ -665,6 +675,16 @@ func (r *ImageGenerator) validatePeerPodsConfigs() error {
665675 return fmt .Errorf ("validatePeerPodsConfigs: cannot find the required keys in peer-pods-cm ConfigMap" )
666676 }
667677
678+ case IBMCloudProvider :
679+ // Check if ibmcloud Secret Keys are present in the peerPodsSecret
680+ if ! checkAnyKeyPresentWithValue (peerPodsSecret .Data , ibmcloudSecretKeys ) {
681+ return fmt .Errorf ("validatePeerPodsConfigs: cannot find the required keys in peer-pods-secret Secret" )
682+ }
683+
684+ // Check if ibmcloud ConfigMap Keys are present in the peerPodsConfigMap
685+ if ! checkKeysPresentAndNotEmpty (peerPodsCM .Data , ibmcloudConfigMapKeys ) {
686+ return fmt .Errorf ("validatePeerPodsConfigs: cannot find the required keys in peer-pods-cm ConfigMap" )
687+ }
668688 default :
669689 return fmt .Errorf ("validatePeerPodsConfigs: unsupported cloud provider %s" , r .provider )
670690 }
@@ -680,18 +700,8 @@ func (r *ImageGenerator) validatePeerPodsConfigs() error {
680700
681701func checkKeysPresentAndNotEmpty (data interface {}, keys []string ) bool {
682702 // Convert the input map to a map[string]string
683- var strMap map [string ]string
684-
685- switch v := data .(type ) {
686- case map [string ]string :
687- strMap = v
688- case map [string ][]byte :
689- strMap = make (map [string ]string )
690- for key , value := range v {
691- strMap [key ] = string (value )
692- }
693- default :
694- // Unsupported type
703+ strMap := toStrMap (data )
704+ if strMap == nil {
695705 return false
696706 }
697707
@@ -708,6 +718,49 @@ func checkKeysPresentAndNotEmpty(data interface{}, keys []string) bool {
708718 return true
709719}
710720
721+ // checkAnyKeyPresentWithValue checks if any of the specified keys are present in the input map
722+ // and have non-empty string values.
723+ // It accepts a map of type map[string][]byte or map[string]string as `data`,
724+ // and a slice of keys to search for.
725+ // Returns true if any key exists in the map and its value is not an empty string.
726+ func checkAnyKeyPresentWithValue (data interface {}, keys []string ) bool {
727+ // Convert the input to a map[string]string using a helper function.
728+ strMap := toStrMap (data )
729+ if strMap == nil {
730+ return false // Return false if conversion fails.
731+ }
732+
733+ // Iterate over the list of keys and check if any key exists with a non-empty value.
734+ for _ , key := range keys {
735+ value , ok := strMap [key ]
736+ if ok && value != "" {
737+ return true // Found a key with a non-empty value.
738+ }
739+ }
740+
741+ igLogger .Info ("checkAnyKeyPresentWithValue: no key is present or has non-empty value" , "searchedKeys" , keys )
742+
743+ return false // No matching key with a non-empty value found.
744+ }
745+
746+ func toStrMap (data interface {}) map [string ]string {
747+ var strMap map [string ]string
748+
749+ switch v := data .(type ) {
750+ case map [string ]string :
751+ strMap = v
752+ case map [string ][]byte :
753+ strMap = make (map [string ]string )
754+ for key , value := range v {
755+ strMap [key ] = string (value )
756+ }
757+ default :
758+ // Unsupported type
759+ return nil
760+ }
761+ return strMap
762+ }
763+
711764func (r * ImageGenerator ) getImageConfigMapName () string {
712765 return r .provider + "-podvm-image-cm"
713766}
@@ -716,6 +769,7 @@ func (r *ImageGenerator) getImageConfigMapName() string {
716769// azure-podvm-image-cm.yaml for Azure
717770// aws-podvm-image-cm.yaml for AWS
718771// libvirt-podvm-image-cm.yaml for Libvirt
772+ // ibmcloud-podvm-image-cm.yaml for IBM Cloud
719773// Returns error if the ConfigMap creation fails
720774
721775func (r * ImageGenerator ) createImageConfigMapFromFile () error {
0 commit comments