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

because these peeps do awesome code reviews

This commit is contained in:
chrislovecnm 2016-11-16 16:39:35 -07:00
parent cd39c71c5e
commit f8e10dc200
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kops/create_cluster.go
View File

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

2
pkg/apis/kops/networking.go
View File

@ -23,7 +23,7 @@ type NetworkingSpec struct {
External *ExternalNetworkingSpec `json:"external,omitempty"` External *ExternalNetworkingSpec `json:"external,omitempty"`
CNI *CNINetworkingSpec `json:"cni,omitempty"` CNI *CNINetworkingSpec `json:"cni,omitempty"`
Kopeio *KopeioNetworkingSpec `json:"kopeio,omitempty"` Kopeio *KopeioNetworkingSpec `json:"kopeio,omitempty"`
Weave *WeaveNetworkingSpec `json:"kopeio,omitempty"` Weave *WeaveNetworkingSpec `json:"weave,omitempty"`
} }
// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes // ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes

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

@ -71,11 +71,11 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
Manifest: fi.String("dns-controller/v1.4.1.yaml"), Manifest: fi.String("dns-controller/v1.4.1.yaml"),
}) })
// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
if b.cluster.Spec.Networking.Kopeio != nil { if b.cluster.Spec.Networking.Kopeio != nil {
key := "networking.kope.io" key := "networking.kope.io"
version := "1.0.20161116" version := "1.0.20161116"
// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
location := key + "/v" + version + ".yaml" location := key + "/v" + version + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
@ -92,6 +92,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
key := "networking.weave.io" key := "networking.weave.io"
version := "1.8.0.20161116" version := "1.8.0.20161116"
// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
location := key + "/v" + version + ".yaml" location := key + "/v" + version + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{