scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

No DNS in vagrant cross minions, need explicit IP as host

Browse Source
This commit is contained in:
derekwaynecarr
2014-09-11 13:38:46 -04:00
parent 7de0989a4e
commit 0c20fffa06
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/vagrant/config-default.sh
View File

@@ -27,12 +27,14 @@ INSTANCE_PREFIX=kubernetes
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"
MASTER_TAG="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"
MINION_TAG="${INSTANCE_PREFIX}-minion" MINION_TAG="${INSTANCE_PREFIX}-minion"
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}})) # Unable to use hostnames yet because DNS is not in cluster, so we revert external look-up name to use the minion IP
#MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
# IP LOCATIONS FOR INTERACTING WITH THE MINIONS # IP LOCATIONS FOR INTERACTING WITH THE MINIONS
MINION_IP_BASE="10.245.2." MINION_IP_BASE="10.245.2."
for (( i=0; i <${NUM_MINIONS}; i++)) do for (( i=0; i <${NUM_MINIONS}; i++)) do
KUBE_MINION_IP_ADDRESSES[$i]="${MINION_IP_BASE}$[$i+2]" KUBE_MINION_IP_ADDRESSES[$i]="${MINION_IP_BASE}$[$i+2]"
MINION_IP[$i]="${MINION_IP_BASE}$[$i+2]" MINION_IP[$i]="${MINION_IP_BASE}$[$i+2]"
MINION_NAMES[$i]="${MINION_IP[$i]}"
VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]" VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]"
done done

1
cluster/vagrant/provision-minion.sh
View File

@@ -50,6 +50,7 @@ grains:
roles: roles:
- kubernetes-pool - kubernetes-pool
cbr-cidr: $MINION_IP_RANGE cbr-cidr: $MINION_IP_RANGE
minion_ip: $MINION_IP
EOF EOF
# we will run provision to update code each time we test, so we do not want to do salt install each time # we will run provision to update code each time we test, so we do not want to do salt install each time

7
pkg/cloudprovider/vagrant/vagrant.go
View File

@@ -106,8 +106,8 @@ func (v *VagrantCloud) IPAddress(instance string) (net.IP, error) {
} }
filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool") filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool")
for _, minion := range filteredMinions { for _, minion := range filteredMinions {
fmt.Println("Minion: ", minion.Host, " , ", instance, " IP: ", minion.IP) // Due to vagrant not running with a dedicated DNS setup, we return the IP address of a minion as its hostname at this time
if minion.Host == instance { if minion.IP == instance {
return net.ParseIP(minion.IP), nil return net.ParseIP(minion.IP), nil
} }
} }
@@ -203,7 +203,8 @@ func (v *VagrantCloud) List(filter string) ([]string, error) {
filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool") filteredMinions := v.saltMinionsByRole(minions, "kubernetes-pool")
var instances []string var instances []string
for _, instance := range filteredMinions { for _, instance := range filteredMinions {
instances = append(instances, instance.Host) // With no dedicated DNS setup in cluster, IP address is used as hostname
instances = append(instances, instance.IP)
} }
return instances, nil return instances, nil

8
pkg/cloudprovider/vagrant/vagrant_test.go
View File

@@ -73,7 +73,11 @@ func TestVagrantCloud(t *testing.T) {
t.Fatalf("Incorrect number of instances returned") t.Fatalf("Incorrect number of instances returned")
} }
if instances[0] != "kubernetes-minion-1" { // no DNS in vagrant cluster, so we return IP as hostname
expectedInstanceHost := "10.245.2.2"
expectedInstanceIP := "10.245.2.2"
if instances[0] != expectedInstanceHost {
t.Fatalf("Invalid instance returned") t.Fatalf("Invalid instance returned")
} }
@@ -82,7 +86,7 @@ func TestVagrantCloud(t *testing.T) {
t.Fatalf("Unexpected error, should have returned a valid IP address: %s", err) t.Fatalf("Unexpected error, should have returned a valid IP address: %s", err)
} }
if ip.String() != "10.245.2.2" { if ip.String() != expectedInstanceIP {
t.Fatalf("Invalid IP address returned") t.Fatalf("Invalid IP address returned")
} }
} }

5
pkg/registry/pod/rest.go
View File

@@ -18,7 +18,6 @@ package pod
import ( import (
"fmt" "fmt"
"strings"
"sync" "sync"
"time" "time"
@@ -195,10 +194,6 @@ func getInstanceIP(cloud cloudprovider.Interface, host string) string {
if instances == nil || !ok { if instances == nil || !ok {
return "" return ""
} }
ix := strings.Index(host, ".")
if ix != -1 {
host = host[:ix]
}
addr, err := instances.IPAddress(host) addr, err := instances.IPAddress(host)
if err != nil { if err != nil {
glog.Errorf("Error getting instance IP: %#v", err) glog.Errorf("Error getting instance IP: %#v", err)