Standardized node IP with 1.13 support

Signed-off-by: French Ben <[email protected]>

Author: French Ben

tools/metaserver/src/metaserver/azure.go

@@ -79,16 +79,17 @@ func (a AzureWeb) Managers() []WebInstance {
 		"AZURE_SUBSCRIPTION_ID": os.Getenv("SUBSCRIPTION_ID"),
 		"AZURE_TENANT_ID":       os.Getenv("TENANT_ID"),
 		"AZURE_GROUP_NAME":      os.Getenv("GROUP_NAME"),
-		"AZURE_PREFIX":          os.Getenv("PREFIX")}
+		"AZURE_VMSS_MGR":        os.Getenv("VMSS_MGR"),
+		"AZURE_VMSS_WRK":        os.Getenv("VMSS_WRK")}
 	nicClient, vmssClient := initClients(env)
 	// Get list of VMSS Network Interfaces for Managers
-	managerIPTable, err := getVMSSNic(nicClient, env, "managervmss")
+	managerIPTable, err := getVMSSNic(nicClient, env, env["AZURE_VMSS_MGR"])
 	if err != nil {
 		fmt.Printf("Couldn't get Manager Nic for VMSS: %v", err)
 		return []WebInstance{}
 	}
 	// Get list of VMSS for Managers
-	managerVMs, err := getVMSSList(vmssClient, env, "managervmss", managerIPTable)
+	managerVMs, err := getVMSSList(vmssClient, env, env["AZURE_VMSS_MGR"], managerIPTable)
 	if err != nil {
 		fmt.Printf("Couldn't get List of Manager VMSS: %v", err)
 	}
@@ -104,16 +105,17 @@ func (a AzureWeb) Workers() []WebInstance {
 		"AZURE_SUBSCRIPTION_ID": os.Getenv("SUBSCRIPTION_ID"),
 		"AZURE_TENANT_ID":       os.Getenv("TENANT_ID"),
 		"AZURE_GROUP_NAME":      os.Getenv("GROUP_NAME"),
-		"AZURE_PREFIX":          os.Getenv("PREFIX")}
+		"AZURE_VMSS_MGR":        os.Getenv("VMSS_MGR"),
+		"AZURE_VMSS_WRK":        os.Getenv("VMSS_WRK")}
 	nicClient, vmssClient := initClients(env)
 	// Get list of VMSS Network Interfaces for Managers
-	workerIPTable, err := getVMSSNic(nicClient, env, "worker-vmss")
+	workerIPTable, err := getVMSSNic(nicClient, env, env["AZURE_VMSS_WRK"])
 	if err != nil {
-		fmt.Errorf("Couldn't get Worker Nic for VMSS: %v", err)
+		fmt.Printf("Couldn't get Worker Nic for VMSS: %v", err)
 		return []WebInstance{}
 	}
 	// Get list of VMSS for Managers
-	workerVMs, err := getVMSSList(vmssClient, env, "worker-vmss", workerIPTable)
+	workerVMs, err := getVMSSList(vmssClient, env, env["AZURE_VMSS_WRK"], workerIPTable)
 	if err != nil {
 		fmt.Printf("Couldn't get List of Worker VMSS: %v", err)
 	}
@@ -136,8 +138,7 @@ func initClients(env map[string]string) (network.InterfacesClient, compute.Virtu
 	return nicClient, vmssClient
 }
 
-func getVMSSNic(client network.InterfacesClient, env map[string]string, vmType string) (IPTable map[string]string, err error) {
-	vmss := fmt.Sprintf("%s-%s", env["AZURE_PREFIX"], vmType)
+func getVMSSNic(client network.InterfacesClient, env map[string]string, vmss string) (IPTable map[string]string, err error) {
 	result, err := client.ListVirtualMachineScaleSetNetworkInterfaces(env["AZURE_GROUP_NAME"], vmss)
 	if err != nil {
 		// Message from an error.
@@ -151,7 +152,6 @@ func getVMSSNic(client network.InterfacesClient, env map[string]string, vmType s
 		if *nic.Properties.Primary {
 			for _, ipConfig := range *nic.Properties.IPConfigurations {
 				if *ipConfig.Properties.Primary {
-					fmt.Printf("Adding: %s to table at index: %s\n\n", *ipConfig.Properties.PrivateIPAddress, *nic.ID)
 					IPTable[*nic.ID] = *ipConfig.Properties.PrivateIPAddress
 				}
 			}
@@ -160,8 +160,7 @@ func getVMSSNic(client network.InterfacesClient, env map[string]string, vmType s
 	return IPTable, nil
 }
 
-func getVMSSList(client compute.VirtualMachineScaleSetVMsClient, env map[string]string, vmType string, nicIPTable map[string]string) ([]WebInstance, error) {
-	vmss := fmt.Sprintf("%s-%s", env["AZURE_PREFIX"], vmType)
+func getVMSSList(client compute.VirtualMachineScaleSetVMsClient, env map[string]string, vmss string, nicIPTable map[string]string) ([]WebInstance, error) {
 	vms := []WebInstance{}
 
 	result, err := client.List(env["AZURE_GROUP_NAME"], vmss, "", "", "")

tools/metaserver/src/metaserver/main.go

@@ -104,8 +104,8 @@ func validate(flavor string) {
 			os.Exit(1)
 		}
 	} else if flavor == "azure" {
-		// add azure validation code here.
-		if !checkEnvVars("APP_ID", "APP_SECRET", "SUBSCRIPTION_ID", "TENANT_ID", "GROUP_NAME", "PREFIX") {
+		// make sure our required ENV variables are available, if not fail.
+		if !checkEnvVars("APP_ID", "APP_SECRET", "SUBSCRIPTION_ID", "TENANT_ID", "GROUP_NAME", "VMSS_MGR", "VMSS_WRK") {
 			os.Exit(1)
 		}
 	} else {

tools/metaserver/src/metaserver/utils.go

@@ -123,33 +123,28 @@ func SwarmNodes() []swarm.Node {
 	return nodes
 }
 
+func nodeIP(id string) string {
+	cli, ctx := DockerClient()
+	// inspect the node ID provided
+	node, _, err := cli.NodeInspectWithRaw(ctx, id)
+	if err != nil {
+		return ""
+	}
+	return node.Status.Addr
+}
+
 func alreadyInSwarm(ip string) bool {
 	// Is the node making the request, already in the swarm.
 	nodes := SwarmNodes()
 	for _, node := range nodes {
-		nodeIP := convertHostToIP(node.Description.Hostname)
+		nodeIP := nodeIP(node.ID)
 		if ip == nodeIP {
 			return true
 		}
 	}
 	return false
 }
 
-func convertHostToIP(hostStr string) string {
-	// This is risky, this assumes the following formation for hosts in swarm node ls
-	// ip-10-0-3-149.ec2.internal
-	// there was one use case when someone had an old account, and their hostnames were not
-	// in this format. they just had
-	// ip-192-168-33-67
-	// not sure how many other formats there are.
-	// This will work for both formats above.
-	hostSplit := strings.Split(hostStr, ".")
-	host := hostSplit[0]
-	host = strings.Replace(host, "ip-", "", -1)
-	ip := strings.Replace(host, "-", ".", -1)
-	return ip
-}
-
 func isNodeInList(ip string, instances []WebInstance) bool {
 	// given an IP, find out if it is in the instance list.
 	for _, instance := range instances {