Merge pull request #10926 from hakman/automated-cherry-pick-of-#10924…

…-upstream-release-1.19 Automated cherry pick of #10924: Fix nil pointer deference for image ID with spotinst
kubernetes · Feb 25, 2021 · 36883b5 · 36883b5
2 parents 2e4233f + 1f7ab4a
commit 36883b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go b/upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go
@@ -479,7 +479,7 @@ func (_ *LaunchSpec) update(cloud awsup.AWSCloud, a, e, changes *LaunchSpec) err
 				return err
 			}
 
-			if *actual.ImageID != *image.ImageId {
+			if fi.StringValue(actual.ImageID) != fi.StringValue(image.ImageId) {
 				spec.SetImageId(image.ImageId)
 			}