From 93f8ab2cfe553fae02aa17ffc0af07a438d10527 Mon Sep 17 00:00:00 2001 From: Pradipta Banerjee Date: Mon, 10 Feb 2025 12:11:55 +0530 Subject: [PATCH] ibm-powervs: Fix incorrect assignment of ImageId The image specified in the annotation was incorrectly overriding the default cluster wide config. Drive-by fix: fix var name for ConfigVerifier Fixes: #2284 Signed-off-by: Pradipta Banerjee --- src/cloud-providers/ibmcloud-powervs/provider.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cloud-providers/ibmcloud-powervs/provider.go b/src/cloud-providers/ibmcloud-powervs/provider.go index 1f44b6c28..e19b5948b 100644 --- a/src/cloud-providers/ibmcloud-powervs/provider.go +++ b/src/cloud-providers/ibmcloud-powervs/provider.go @@ -52,14 +52,16 @@ func (p *ibmcloudPowerVSProvider) CreateInstance(ctx context.Context, podName, s return nil, err } + imageId := p.serviceConfig.ImageId + if spec.Image != "" { logger.Printf("Choosing %s from annotation as the Power VS image for the PodVM image", spec.Image) - p.serviceConfig.ImageId = spec.Image + imageId = spec.Image } body := &models.PVMInstanceCreate{ ServerName: &instanceName, - ImageID: &p.serviceConfig.ImageId, + ImageID: &imageId, KeyPairName: p.serviceConfig.SSHKey, Networks: []*models.PVMInstanceAddNetwork{ { @@ -148,8 +150,8 @@ func (p *ibmcloudPowerVSProvider) Teardown() error { } func (p *ibmcloudPowerVSProvider) ConfigVerifier() error { - ImageId := p.serviceConfig.ImageId - if len(ImageId) == 0 { + imageId := p.serviceConfig.ImageId + if len(imageId) == 0 { return fmt.Errorf("ImageId is empty") } return nil