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

Merge pull request #11078 from MoShitrit/aws-cni-1.7.10 

Upgrade AWS CNI to version 1.7.10
This commit is contained in:
Kubernetes Prow Robot 2021-03-19 23:21:42 -07:00 committed by GitHub
parent 00bbf55371 d72006aaf0
commit 1b7dd3b5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/models/bindata.go generated
View File

@ -30884,7 +30884,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by
- "name": "{{ .Name }}" - "name": "{{ .Name }}"
"value": "{{ .Value }}" "value": "{{ .Value }}"
{{- end }} {{- end }}
"image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9" }}" "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.10" }}"
"imagePullPolicy": "Always" "imagePullPolicy": "Always"
"livenessProbe": "livenessProbe":
"exec": "exec":
@ -30927,7 +30927,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by
- "env": - "env":
- "name": "DISABLE_TCP_EARLY_DEMUX" - "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false" "value": "false"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9" "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10"
"imagePullPolicy": "Always" "imagePullPolicy": "Always"
"name": "aws-vpc-cni-init" "name": "aws-vpc-cni-init"
"securityContext": "securityContext":

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

@ -148,7 +148,7 @@
- "name": "{{ .Name }}" - "name": "{{ .Name }}"
"value": "{{ .Value }}" "value": "{{ .Value }}"
{{- end }} {{- end }}
"image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9" }}" "image": "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.10" }}"
"imagePullPolicy": "Always" "imagePullPolicy": "Always"
"livenessProbe": "livenessProbe":
"exec": "exec":
@ -191,7 +191,7 @@
- "env": - "env":
- "name": "DISABLE_TCP_EARLY_DEMUX" - "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false" "value": "false"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9" "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10"
"imagePullPolicy": "Always" "imagePullPolicy": "Always"
"name": "aws-vpc-cni-init" "name": "aws-vpc-cni-init"
"securityContext": "securityContext":

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

@ -79,7 +79,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0' kubernetesVersion: '>=1.16.0'
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 1e2c852821287f009d36cb35d20b84e676a6c4f2 manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"

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

@ -174,7 +174,7 @@ spec:
value: "10" value: "10"
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug value: debug
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.10
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -217,7 +217,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext:

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

@ -79,7 +79,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0' kubernetesVersion: '>=1.16.0'
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: d6ca46e4f4f742a2effbbfcecd3d01b5945ff1c3 manifestHash: 992ea59e207a3905600f7b9fbf99809093d6f964
name: networking.amazon-vpc-routed-eni name: networking.amazon-vpc-routed-eni
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"

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

@ -174,7 +174,7 @@ spec:
value: "10" value: "10"
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
value: debug value: debug
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.9 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.10
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
exec: exec:
@ -217,7 +217,7 @@ spec:
- env: - env:
- name: DISABLE_TCP_EARLY_DEMUX - name: DISABLE_TCP_EARLY_DEMUX
value: "false" value: "false"
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.9 image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.10
imagePullPolicy: Always imagePullPolicy: Always
name: aws-vpc-cni-init name: aws-vpc-cni-init
securityContext: securityContext: