Merge pull request #6132 from mikesplain/automated-cherry-pick-of-#61…

…28-origin-release-1.11 Automated cherry pick of #6128: Update amazon cni to 1.3.0
kubernetes · Nov 29, 2018 · 3923146 · 3923146
2 parents 0c5a0a5 + b0d7178
commit 3923146
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 46 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template
@@ -1,4 +1,4 @@
-# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
+# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.3.0/config/v1.3/aws-k8s-cni.yaml
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -22,15 +22,12 @@ rules:
   resources:
   - daemonsets
   verbs: ["list", "watch"]
-
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: aws-node
   namespace: kube-system
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -44,9 +41,7 @@ subjects:
 - kind: ServiceAccount
   name: aws-node
   namespace: kube-system
-
 ---
-
 kind: DaemonSet
 apiVersion: extensions/v1beta1
 metadata:
@@ -70,16 +65,11 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      - effect: NoExecute
-        operator: Exists
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       containers:
-      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
+      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.3.0" }}"
         ports:
-        - containerPort: 60000
+        - containerPort: 61678
           name: metrics
         name: aws-node
         env:
@@ -120,7 +110,6 @@ spec:
       - name: dockersock
         hostPath:
           path: /var/run/docker.sock
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition

diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.7.yaml.template
@@ -1,4 +1,4 @@
-# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
+# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.3.0/config/v1.3/aws-k8s-cni.yaml
 
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -22,15 +22,12 @@ rules:
   resources:
   - daemonsets
   verbs: ["list", "watch"]
-
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: aws-node
   namespace: kube-system
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
@@ -44,9 +41,7 @@ subjects:
 - kind: ServiceAccount
   name: aws-node
   namespace: kube-system
-
 ---
-
 kind: DaemonSet
 apiVersion: extensions/v1beta1
 metadata:
@@ -70,16 +65,11 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      - effect: NoExecute
-        operator: Exists
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       containers:
-      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
+      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.3.0" }}"
         ports:
-        - containerPort: 60000
+        - containerPort: 61678
           name: metrics
         name: aws-node
         env:
@@ -120,7 +110,6 @@ spec:
       - name: dockersock
         hostPath:
           path: /var/run/docker.sock
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition

diff --git a/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.8.yaml.template
@@ -1,4 +1,4 @@
-# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
+# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.3.0/config/v1.3/aws-k8s-cni.yaml
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -22,15 +22,12 @@ rules:
   resources:
   - daemonsets
   verbs: ["list", "watch"]
-
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: aws-node
   namespace: kube-system
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -44,9 +41,7 @@ subjects:
 - kind: ServiceAccount
   name: aws-node
   namespace: kube-system
-
 ---
-
 kind: DaemonSet
 apiVersion: extensions/v1beta1
 metadata:
@@ -70,16 +65,11 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      - effect: NoExecute
-        operator: Exists
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       containers:
-      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
+      - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.3.0" }}"
         ports:
-        - containerPort: 60000
+        - containerPort: 61678
           name: metrics
         name: aws-node
         env:
@@ -120,7 +110,6 @@ spec:
       - name: dockersock
         hostPath:
           path: /var/run/docker.sock
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -837,7 +837,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.AmazonVPC != nil {
 		key := "networking.amazon-vpc-routed-eni"
-		version := "1.2.1-kops.1"
+		version := "1.3.0-kops.1"
 
 		{
 			id := "k8s-1.7"