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

update lyft cni plugin to 0.4.2

This commit is contained in:
Chris Phillips 2018-08-27 14:22:10 -07:00
parent 9792c02b48
commit 9755318db9
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
upup/models/nodeup/resources/_lyft_vpc_cni/files/etc/cni/net.d/10-cni-ipvlan-vpc-k8s.conflist.template
View File

@ -1,26 +1,25 @@
{ {
"cniVersion": "0.3.1", "cniVersion": "0.3.1",
"name": "cni-ipvlan-vpc-k8s", "name": "cni-ipvlan-vpc-k8s",
"plugins": [ "plugins": [
{ {
"cniVersion": "0.3.1", "cniVersion": "0.3.1",
"type": "cni-ipvlan-vpc-k8s-ipvlan", "type": "cni-ipvlan-vpc-k8s-ipam",
"mode": "l2", "interfaceIndex": 1,
"master": "ipam", "subnetTags": {{ SubnetTags }},
"ipam": { "secGroupIds": {{ NodeSecurityGroups }}
"type": "cni-ipvlan-vpc-k8s-ipam", },
"interfaceIndex": 1, {
"subnetTags": {{ SubnetTags }}, "cniVersion": "0.3.1",
"routeToVpcPeers": true, "type": "cni-ipvlan-vpc-k8s-ipvlan",
"secGroupIds": {{ NodeSecurityGroups }} "mode": "l2"
} },
}, {
{ "cniVersion": "0.3.1",
"cniVersion": "0.3.1", "type": "cni-ipvlan-vpc-k8s-unnumbered-ptp",
"type": "cni-ipvlan-vpc-k8s-unnumbered-ptp", "hostInterface": "eth0",
"hostInterface": "eth0", "containerInterface": "veth0",
"containerInterface": "veth0", "ipMasq": true
"ipMasq": true }
}
] ]
} }

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

@ -1095,7 +1095,7 @@ func (c *ApplyClusterCmd) AddFileAssets(assetBuilder *assets.AssetBuilder) error
if c.Cluster.Spec.Networking.LyftVPC != nil { if c.Cluster.Spec.Networking.LyftVPC != nil {
lyftVPCDownloadURL := os.Getenv("LYFT_VPC_DOWNLOAD_URL") lyftVPCDownloadURL := os.Getenv("LYFT_VPC_DOWNLOAD_URL")
if lyftVPCDownloadURL == "" { if lyftVPCDownloadURL == "" {
lyftVPCDownloadURL = "818c50109eb6fb5bf2206426c4ceb1d48bab9ca52e1447335a9ce0788810d78c@https://github.com/lyft/cni-ipvlan-vpc-k8s/releases/download/v0.3.1/cni-ipvlan-vpc-k8s-v0.3.1.tar.gz" lyftVPCDownloadURL = "bfdc65028a3bf8ffe14388fca28ede3600e7e2dee4e781908b6a23f9e79f86ad@https://github.com/lyft/cni-ipvlan-vpc-k8s/releases/download/v0.4.2/cni-ipvlan-vpc-k8s-v0.4.2.tar.gz"
} else { } else {
glog.Warningf("Using url from LYFT_VPC_DOWNLOAD_URL env var: %q", lyftVPCDownloadURL) glog.Warningf("Using url from LYFT_VPC_DOWNLOAD_URL env var: %q", lyftVPCDownloadURL)
} }