azure: 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 <pradipta.banerjee@gmail.com>

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