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

Merge pull request #15809 from moshevayner/aws-cni-1-13-4 

Bump AWS CNI to 1.13.4
This commit is contained in:
Kubernetes Prow Robot 2023-08-22 05:06:54 -07:00 committed by GitHub
parent fc30975eba 0b2de28f70
commit 099db1f252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 69 additions and 136 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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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: 535b2db589b002882557a247f5fefbfdec6b0015032a0e70f2b0de834da4a150 manifestHash: 7783f69ff595f86c5bab56d6ca740493e77ef2dc4124182232d69df934fb4581
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -234,7 +227,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -283,7 +276,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

16
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.13.2" app.kubernetes.io/version: "v1.13.4"
--- ---
# 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.13.2" app.kubernetes.io/version: "v1.13.4"
rules: rules:
- apiGroups: - apiGroups:
- crd.k8s.amazonaws.com - crd.k8s.amazonaws.com
@ -70,10 +70,6 @@ rules:
resources: resources:
- nodes - nodes
verbs: ["list", "watch", "get", "update"] verbs: ["list", "watch", "get", "update"]
- apiGroups: ["extensions"]
resources:
- '*'
verbs: ["list", "watch"]
- apiGroups: ["", "events.k8s.io"] - apiGroups: ["", "events.k8s.io"]
resources: resources:
- events - events
@ -88,7 +84,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.13.2" app.kubernetes.io/version: "v1.13.4"
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
@ -108,7 +104,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.13.2" app.kubernetes.io/version: "v1.13.4"
spec: spec:
updateStrategy: updateStrategy:
rollingUpdate: rollingUpdate:
@ -129,7 +125,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.13.2" }}" image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4" }}"
env: env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
@ -154,7 +150,7 @@ spec:
{{ end }} {{ end }}
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.13.2" }}" image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4" }}"
ports: ports:
- containerPort: 61678 - containerPort: 61678
name: metrics name: metrics

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

@ -99,7 +99,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: d74c8da06280966b6aa6b882041149c7b863ab425c2995c694ba5bbab4bbea67 manifestHash: d5a88ecd4337ff205a6dc01636ce908c012f705b261ebf7c8624192ffb76ea59
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -236,7 +229,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -285,7 +278,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests:

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

@ -99,7 +99,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: d74c8da06280966b6aa6b882041149c7b863ab425c2995c694ba5bbab4bbea67 manifestHash: d5a88ecd4337ff205a6dc01636ce908c012f705b261ebf7c8624192ffb76ea59
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
needsRollingUpdate: all needsRollingUpdate: all
selector: selector:

19
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.13.2 app.kubernetes.io/version: v1.13.4
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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -90,13 +90,6 @@ rules:
- watch - watch
- get - get
- update - update
- apiGroups:
- extensions
resources:
- '*'
verbs:
- list
- watch
- apiGroups: - apiGroups:
- "" - ""
- events.k8s.io - events.k8s.io
@ -118,7 +111,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.13.2 app.kubernetes.io/version: v1.13.4
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 +135,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.13.2 app.kubernetes.io/version: v1.13.4
k8s-app: aws-node k8s-app: aws-node
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
name: aws-node name: aws-node
@ -236,7 +229,7 @@ spec:
fieldPath: metadata.name fieldPath: metadata.name
- 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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4
livenessProbe: livenessProbe:
exec: exec:
command: command:
@ -285,7 +278,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.13.2 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4
name: aws-vpc-cni-init name: aws-vpc-cni-init
resources: resources:
requests: requests: