mirror of https://github.com/kubernetes/kops.git
				
				
				
			Merge pull request #11078 from MoShitrit/aws-cni-1.7.10
Upgrade AWS CNI to version 1.7.10
This commit is contained in:
		
						commit
						1b7dd3b5b8
					
				|  | @ -30884,7 +30884,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by | |||
|         - "name": "{{ .Name }}" | ||||
|           "value": "{{ .Value }}" | ||||
|         {{- 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" | ||||
|         "livenessProbe": | ||||
|           "exec": | ||||
|  | @ -30927,7 +30927,7 @@ var _cloudupResourcesAddonsNetworkingAmazonVpcRoutedEniK8s116YamlTemplate = []by | |||
|       - "env": | ||||
|         - "name": "DISABLE_TCP_EARLY_DEMUX" | ||||
|           "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" | ||||
|         "name": "aws-vpc-cni-init" | ||||
|         "securityContext": | ||||
|  |  | |||
|  | @ -148,7 +148,7 @@ | |||
|         - "name": "{{ .Name }}" | ||||
|           "value": "{{ .Value }}" | ||||
|         {{- 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" | ||||
|         "livenessProbe": | ||||
|           "exec": | ||||
|  | @ -191,7 +191,7 @@ | |||
|       - "env": | ||||
|         - "name": "DISABLE_TCP_EARLY_DEMUX" | ||||
|           "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" | ||||
|         "name": "aws-vpc-cni-init" | ||||
|         "securityContext": | ||||
|  |  | |||
|  | @ -79,7 +79,7 @@ spec: | |||
|   - id: k8s-1.16 | ||||
|     kubernetesVersion: '>=1.16.0' | ||||
|     manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml | ||||
|     manifestHash: 1e2c852821287f009d36cb35d20b84e676a6c4f2 | ||||
|     manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126 | ||||
|     name: networking.amazon-vpc-routed-eni | ||||
|     selector: | ||||
|       role.kubernetes.io/networking: "1" | ||||
|  |  | |||
|  | @ -174,7 +174,7 @@ spec: | |||
|           value: "10" | ||||
|         - name: AWS_VPC_K8S_CNI_LOGLEVEL | ||||
|           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 | ||||
|         livenessProbe: | ||||
|           exec: | ||||
|  | @ -217,7 +217,7 @@ spec: | |||
|       - env: | ||||
|         - name: DISABLE_TCP_EARLY_DEMUX | ||||
|           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 | ||||
|         name: aws-vpc-cni-init | ||||
|         securityContext: | ||||
|  |  | |||
|  | @ -79,7 +79,7 @@ spec: | |||
|   - id: k8s-1.16 | ||||
|     kubernetesVersion: '>=1.16.0' | ||||
|     manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml | ||||
|     manifestHash: d6ca46e4f4f742a2effbbfcecd3d01b5945ff1c3 | ||||
|     manifestHash: 992ea59e207a3905600f7b9fbf99809093d6f964 | ||||
|     name: networking.amazon-vpc-routed-eni | ||||
|     selector: | ||||
|       role.kubernetes.io/networking: "1" | ||||
|  |  | |||
|  | @ -174,7 +174,7 @@ spec: | |||
|           value: "10" | ||||
|         - name: AWS_VPC_K8S_CNI_LOGLEVEL | ||||
|           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 | ||||
|         livenessProbe: | ||||
|           exec: | ||||
|  | @ -217,7 +217,7 @@ spec: | |||
|       - env: | ||||
|         - name: DISABLE_TCP_EARLY_DEMUX | ||||
|           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 | ||||
|         name: aws-vpc-cni-init | ||||
|         securityContext: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue