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

Upgrade AWS VPC CNI to 1.5.5

This commit is contained in:
Peter Rifel 2019-11-17 10:47:42 -06:00
parent 8c3c493a47
commit 57d72da5ec
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -2221,7 +2221,7 @@ spec:
properties: properties:
imageName: imageName:
description: 'The container image name to use, which by default description: 'The container image name to use, which by default
is: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0' is: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5'
type: string type: string
type: object type: object
calico: calico:

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

@ -151,7 +151,7 @@ type RomanaNetworkingSpec struct {
// AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking
type AmazonVPCNetworkingSpec struct { type AmazonVPCNetworkingSpec struct {
// The container image name to use, which by default is: // The container image name to use, which by default is:
// 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.0 // 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5
ImageName string `json:"imageName,omitempty"` ImageName string `json:"imageName,omitempty"`
} }

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

@ -151,7 +151,7 @@ type RomanaNetworkingSpec struct {
// AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking
type AmazonVPCNetworkingSpec struct { type AmazonVPCNetworkingSpec struct {
// The container image name to use, which by default is: // The container image name to use, which by default is:
// 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0 // 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5
ImageName string `json:"imageName,omitempty"` ImageName string `json:"imageName,omitempty"`
} }

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

@ -151,7 +151,7 @@ type RomanaNetworkingSpec struct {
// AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking
type AmazonVPCNetworkingSpec struct { type AmazonVPCNetworkingSpec struct {
// The container image name to use, which by default is: // The container image name to use, which by default is:
// 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0 // 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5
ImageName string `json:"imageName,omitempty"` ImageName string `json:"imageName,omitempty"`
} }

4
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.12.yaml.template
View File

@ -1,4 +1,4 @@
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.5.0/config/v1.5/aws-k8s-cni.yaml # Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.5.5/config/v1.5/aws-k8s-cni.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
@ -78,7 +78,7 @@ spec:
tolerations: tolerations:
- operator: Exists - operator: Exists
containers: containers:
- image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.0" }}" - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.5" }}"
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 61678 - containerPort: 61678

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

@ -1050,7 +1050,13 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.AmazonVPC != nil { if b.cluster.Spec.Networking.AmazonVPC != nil {
key := "networking.amazon-vpc-routed-eni" key := "networking.amazon-vpc-routed-eni"
version := "1.5.0-kops.1"
versions := map[string]string{
"k8s-1.7": "1.5.0-kops.1",
"k8s-1.8": "1.5.0-kops.1",
"k8s-1.10": "1.5.0-kops.1",
"k8s-1.12": "1.5.5-kops.1",
}
{ {
id := "k8s-1.7" id := "k8s-1.7"
@ -1058,7 +1064,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(versions[id]),
Selector: networkingSelector, Selector: networkingSelector,
Manifest: fi.String(location), Manifest: fi.String(location),
KubernetesVersion: ">=1.7.0 <1.8.0", KubernetesVersion: ">=1.7.0 <1.8.0",
@ -1072,7 +1078,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(versions[id]),
Selector: networkingSelector, Selector: networkingSelector,
Manifest: fi.String(location), Manifest: fi.String(location),
KubernetesVersion: ">=1.8.0 <1.10.0", KubernetesVersion: ">=1.8.0 <1.10.0",
@ -1086,7 +1092,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(versions[id]),
Selector: networkingSelector, Selector: networkingSelector,
Manifest: fi.String(location), Manifest: fi.String(location),
KubernetesVersion: ">=1.10.0 <1.12.0", KubernetesVersion: ">=1.10.0 <1.12.0",
@ -1100,7 +1106,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(versions[id]),
Selector: networkingSelector, Selector: networkingSelector,
Manifest: fi.String(location), Manifest: fi.String(location),
KubernetesVersion: ">=1.12.0", KubernetesVersion: ">=1.12.0",