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

Merge pull request #15248 from moshevayner/aws-cni-1.12.5 

Bump AWS CNI to 1.25.5
This commit is contained in:
Kubernetes Prow Robot 2023-03-19 03:25:15 -07:00 committed by GitHub
parent 82f474fb7c 9477463655
commit 69519a9e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -178,7 +178,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -185,7 +185,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -185,7 +185,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -185,7 +185,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -186,7 +186,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -178,7 +178,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -178,7 +178,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 547e1a901abac73eddc6e58028feb822e3048585357ec73fa64dd9f71f457cce manifestHash: eeb66056bdf5cf1f69437de07effc0fea26585db62e0e7596bfaff6fc50d4bf2
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-networking.amazon-vpc-routed-eni-k8s-1.16_content
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -228,7 +228,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -277,7 +277,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

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

@ -33,7 +33,7 @@ metadata:
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node k8s-app: aws-node
app.kubernetes.io/version: "v1.12.2" app.kubernetes.io/version: "v1.12.5"
--- ---
# Source: aws-vpc-cni/templates/clusterrole.yaml # Source: aws-vpc-cni/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
@ -44,7 +44,7 @@ metadata:
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node k8s-app: aws-node
app.kubernetes.io/version: "v1.12.2" app.kubernetes.io/version: "v1.12.5"
rules: rules:
- apiGroups: - apiGroups:
- crd.k8s.amazonaws.com - crd.k8s.amazonaws.com
@ -88,7 +88,7 @@ metadata:
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node k8s-app: aws-node
app.kubernetes.io/version: "v1.12.2" app.kubernetes.io/version: "v1.12.5"
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
@ -108,7 +108,7 @@ metadata:
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node k8s-app: aws-node
app.kubernetes.io/version: "v1.12.2" app.kubernetes.io/version: "v1.12.5"
spec: spec:
updateStrategy: updateStrategy:
rollingUpdate: rollingUpdate:
@ -129,7 +129,7 @@ spec:
hostNetwork: true hostNetwork: true
initContainers: initContainers:
- name: aws-vpc-cni-init - name: aws-vpc-cni-init
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2" }}" image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5" }}"
env: env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
@ -147,7 +147,7 @@ spec:
{} {}
containers: containers:
- name: aws-node - name: aws-node
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2" }}" image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5" }}"
ports: ports:
- containerPort: 61678 - containerPort: 61678
name: metrics name: metrics
@ -182,8 +182,6 @@ spec:
# value: "true" # value: "true"
# - name: AWS_VPC_ENI_MTU # - name: AWS_VPC_ENI_MTU
# value: "9001" # value: "9001"
# - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
# value: "false"
# - name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG # - name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG
# value: "false" # value: "false"
# - name: AWS_VPC_K8S_CNI_EXTERNALSNAT # - name: AWS_VPC_K8S_CNI_EXTERNALSNAT

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: a411ad1a94134f2d87100a7d8ca9f79486a8c3ebea61180619d7d56f50ef0dd3 manifestHash: 6f4775ca3d3e0d5709c9d8944a27a7895d5f553bc3d4024c8854cc8027d0e1be
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -230,7 +230,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -279,7 +279,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.16 - id: k8s-1.16
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: a411ad1a94134f2d87100a7d8ca9f79486a8c3ebea61180619d7d56f50ef0dd3 manifestHash: 6f4775ca3d3e0d5709c9d8944a27a7895d5f553bc3d4024c8854cc8027d0e1be
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

12
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -35,7 +35,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -52,7 +52,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -118,7 +118,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -142,7 +142,7 @@ metadata:
app.kubernetes.io/instance: aws-vpc-cni app.kubernetes.io/instance: aws-vpc-cni
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
app.kubernetes.io/name: aws-node app.kubernetes.io/name: aws-node
app.kubernetes.io/version: v1.12.2 app.kubernetes.io/version: v1.12.5
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -230,7 +230,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: minimal.example.com value: minimal.example.com
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -279,7 +279,7 @@ spec:
value: "false" value: "false"
- name: ENABLE_IPv6 - name: ENABLE_IPv6
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:
privileged: true privileged: true