[ARVADOS] updated: 1.3.0-593-g7ef48a595

Git user git at public.curoverse.com
Thu Mar 21 20:55:17 UTC 2019


Summary of changes:
 lib/cloud/azure/azure.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  7ef48a5956f4032eee9790b06cc18ab36395d788 (commit)
       via  998d661e82eb093e2e64965b342081e3c86e0831 (commit)
      from  b715e06b9f8ac2ca1037a63dc90b3c235557dbde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7ef48a5956f4032eee9790b06cc18ab36395d788
Merge: b715e06b9 998d661e8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Mar 21 16:55:00 2019 -0400

    Merge branch '15007-azure-panic'
    
    fixes #15007
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 998d661e82eb093e2e64965b342081e3c86e0831
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Mar 21 16:54:49 2019 -0400

    15007: Fix crash when Azure nic has IP config but no IP address.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index d19e4bef2..be7980ae7 100644
--- a/lib/cloud/azure/azure.go
+++ b/lib/cloud/azure/azure.go
@@ -647,7 +647,8 @@ func (ai *azureInstance) Destroy() error {
 func (ai *azureInstance) Address() string {
 	if ai.nic.IPConfigurations != nil &&
 		len(*ai.nic.IPConfigurations) > 0 &&
-		(*ai.nic.IPConfigurations)[0].PrivateIPAddress != nil {
+		(*ai.nic.IPConfigurations)[0].InterfaceIPConfigurationPropertiesFormat != nil &&
+		(*ai.nic.IPConfigurations)[0].InterfaceIPConfigurationPropertiesFormat.PrivateIPAddress != nil {
 
 		return *(*ai.nic.IPConfigurations)[0].PrivateIPAddress
 	}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list