diff --git a/upup/models/nodeup/resources/_lyft_vpc_cni/files/etc/cni/net.d/10-cni-ipvlan-vpc-k8s.conflist.template b/upup/models/nodeup/resources/_lyft_vpc_cni/files/etc/cni/net.d/10-cni-ipvlan-vpc-k8s.conflist.template index e329d4f556..b3b9b70d77 100644 --- a/upup/models/nodeup/resources/_lyft_vpc_cni/files/etc/cni/net.d/10-cni-ipvlan-vpc-k8s.conflist.template +++ b/upup/models/nodeup/resources/_lyft_vpc_cni/files/etc/cni/net.d/10-cni-ipvlan-vpc-k8s.conflist.template @@ -1,26 +1,25 @@ { - "cniVersion": "0.3.1", - "name": "cni-ipvlan-vpc-k8s", - "plugins": [ - { - "cniVersion": "0.3.1", - "type": "cni-ipvlan-vpc-k8s-ipvlan", - "mode": "l2", - "master": "ipam", - "ipam": { - "type": "cni-ipvlan-vpc-k8s-ipam", - "interfaceIndex": 1, - "subnetTags": {{ SubnetTags }}, - "routeToVpcPeers": true, - "secGroupIds": {{ NodeSecurityGroups }} - } - }, - { - "cniVersion": "0.3.1", - "type": "cni-ipvlan-vpc-k8s-unnumbered-ptp", - "hostInterface": "eth0", - "containerInterface": "veth0", - "ipMasq": true - } + "cniVersion": "0.3.1", + "name": "cni-ipvlan-vpc-k8s", + "plugins": [ + { + "cniVersion": "0.3.1", + "type": "cni-ipvlan-vpc-k8s-ipam", + "interfaceIndex": 1, + "subnetTags": {{ SubnetTags }}, + "secGroupIds": {{ NodeSecurityGroups }} + }, + { + "cniVersion": "0.3.1", + "type": "cni-ipvlan-vpc-k8s-ipvlan", + "mode": "l2" + }, + { + "cniVersion": "0.3.1", + "type": "cni-ipvlan-vpc-k8s-unnumbered-ptp", + "hostInterface": "eth0", + "containerInterface": "veth0", + "ipMasq": true + } ] -} +} \ No newline at end of file diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 048bb6d5e7..5d64b3c53a 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1095,7 +1095,7 @@ func (c *ApplyClusterCmd) AddFileAssets(assetBuilder *assets.AssetBuilder) error if c.Cluster.Spec.Networking.LyftVPC != nil { lyftVPCDownloadURL := os.Getenv("LYFT_VPC_DOWNLOAD_URL") 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 { glog.Warningf("Using url from LYFT_VPC_DOWNLOAD_URL env var: %q", lyftVPCDownloadURL) }