Merge pull request #12233 from zetaab/automated-cherry-pick-of-#12232…

…-origin-release-1.22 Automated cherry pick of #12232: check does iface has associations
kubernetes · Aug 31, 2021 · 5b17b36 · 5b17b36
2 parents 7af2747 + 774f4d1
commit 5b17b36
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
@@ -2100,7 +2100,7 @@ func GetInstanceCertificateNames(instances *ec2.DescribeInstancesOutput) (addrs
 		if iface.Ipv6Addresses != nil && len(iface.Ipv6Addresses) > 0 {
 			addrs = append(addrs, *iface.Ipv6Addresses[0].Ipv6Address)
 		}
-		if iface.Association.PublicIp != nil {
+		if iface.Association != nil && iface.Association.PublicIp != nil {
 			addrs = append(addrs, *iface.Association.PublicIp)
 		}
 	}