kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating bugs

This commit is contained in:
chrislovecnm 2016-11-16 20:05:27 -05:00
parent 60dce754b0
commit a890390fbf
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_cluster.go
View File

@ -536,7 +536,7 @@ func parseZoneList(s string) []string {
func supportsPrivateTopology(n *api.NetworkingSpec) bool { func supportsPrivateTopology(n *api.NetworkingSpec) bool {
if n.CNI != nil && n.Kopeio != nil && n.Weave != nil { if n.CNI != nil || n.Kopeio != nil || n.Weave != nil {
return true return true
} }
return false return false

3
hack/dev-build.sh
View File

@ -56,7 +56,7 @@ MASTER_SIZE=${MASTER_SIZE:-m4.large}
# NETWORK # NETWORK
TOPOLOGY=${TOPOLOGY:-private} TOPOLOGY=${TOPOLOGY:-private}
NETWORKING=${NETWORKING:-cni} NETWORKING=${NETWORKING:-weave}
VERBOSITY=${VERBOSITY:-2} VERBOSITY=${VERBOSITY:-2}
@ -96,6 +96,7 @@ NODEUP_URL=${NODEUP_URL} kops create cluster \
--topology $TOPOLOGY \ --topology $TOPOLOGY \
--networking $NETWORKING \ --networking $NETWORKING \
-v $VERBOSITY \ -v $VERBOSITY \
--image "k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-11-16" \
--yes --yes
echo ========== echo ==========

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -89,7 +89,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
} }
if b.cluster.Spec.Networking.Weave != nil { if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave.io" key := "networking.weave"
version := "1.8.0.20161116" version := "1.8.0.20161116"
// TODO: Create configuration object for cni providers (maybe create it but orphan it)? // TODO: Create configuration object for cni providers (maybe create it but orphan it)?

2
upup/pkg/fi/cloudup/tagbuilder.go
View File

@ -140,7 +140,7 @@ func buildNodeupTags(role api.InstanceGroupRole, cluster *api.Cluster, clusterTa
return nil, fmt.Errorf("Networking is not set, and should not be nil here") return nil, fmt.Errorf("Networking is not set, and should not be nil here")
} }
if networking.CNI != nil { if networking.CNI != nil || networking.Weave != nil {
// external is based on cni, weave, flannel, etc // external is based on cni, weave, flannel, etc
tags = append(tags, "_networking_cni") tags = append(tags, "_networking_cni")
} }