Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick to master - (#1551) #1552

Merged
merged 2 commits into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## v1.9.0
* Enhancement - [EC2 sdk model override](https://github.com/aws/amazon-vpc-cni-k8s/pull/1508) (#1508, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [Prefix Delegation feature support](https://github.com/aws/amazon-vpc-cni-k8s/pull/1516) (#1516, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [Header formatting for env variable](https://github.com/aws/amazon-vpc-cni-k8s/pull/1522) (#1522, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [non-nitro instances init issues](https://github.com/aws/amazon-vpc-cni-k8s/pull/1527) (#1527, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [Add metrics for total prefix count and ips used per cidr](https://github.com/aws/amazon-vpc-cni-k8s/pull/1530) (#1530, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [Update documentation for PD](https://github.com/aws/amazon-vpc-cni-k8s/pull/1540) (#1540, [@jayanthvn](https://github.com/jayanthvn))
* Enhancement - [Update SDK Go version](https://github.com/aws/amazon-vpc-cni-k8s/pull/1544) (#1544, [@jayanthvn](https://github.com/jayanthvn))

## v1.8.0
* Bug - [Use symmetric return path for non-VPC traffic - alternate solution](https://github.com/aws/amazon-vpc-cni-k8s/pull/1475) (#1475, [@kishorj](https://github.com/kishorj))
* Bug - [Gracefully handle failed ENI SG update](https://github.com/aws/amazon-vpc-cni-k8s/pull/1341) (#1341, [@jayanthvn](https://github.com/jayanthvn))
Expand Down
8 changes: 6 additions & 2 deletions config/master/aws-k8s-cni-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@
"value": "false"
- "name": "ENABLE_POD_ENI"
"value": "false"
- "name": "ENABLE_PREFIX_DELEGATION"
"value": "false"
- "name": "MY_NODE_NAME"
"valueFrom":
"fieldRef":
"fieldPath": "spec.nodeName"
- "name": "WARM_ENI_TARGET"
"value": "1"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:latest"
- "name": "WARM_PREFIX_TARGET"
"value": "1"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.9.0"
"livenessProbe":
"exec":
"command":
Expand Down Expand Up @@ -196,7 +200,7 @@
- "env":
- "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:latest"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.9.0"
"name": "aws-vpc-cni-init"
"securityContext":
"privileged": true
Expand Down
8 changes: 6 additions & 2 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@
"value": "false"
- "name": "ENABLE_POD_ENI"
"value": "false"
- "name": "ENABLE_PREFIX_DELEGATION"
"value": "false"
- "name": "MY_NODE_NAME"
"valueFrom":
"fieldRef":
"fieldPath": "spec.nodeName"
- "name": "WARM_ENI_TARGET"
"value": "1"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:latest"
- "name": "WARM_PREFIX_TARGET"
"value": "1"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.9.0"
"livenessProbe":
"exec":
"command":
Expand Down Expand Up @@ -196,7 +200,7 @@
- "env":
- "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:latest"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
"name": "aws-vpc-cni-init"
"securityContext":
"privileged": true
Expand Down
8 changes: 6 additions & 2 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@
"value": "false"
- "name": "ENABLE_POD_ENI"
"value": "false"
- "name": "ENABLE_PREFIX_DELEGATION"
"value": "false"
- "name": "MY_NODE_NAME"
"valueFrom":
"fieldRef":
"fieldPath": "spec.nodeName"
- "name": "WARM_ENI_TARGET"
"value": "1"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:latest"
- "name": "WARM_PREFIX_TARGET"
"value": "1"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.9.0"
"livenessProbe":
"exec":
"command":
Expand Down Expand Up @@ -196,7 +200,7 @@
- "env":
- "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:latest"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
"name": "aws-vpc-cni-init"
"securityContext":
"privileged": true
Expand Down
6 changes: 4 additions & 2 deletions config/master/aws-k8s-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@
"fieldPath": "spec.nodeName"
- "name": "WARM_ENI_TARGET"
"value": "1"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:latest"
- "name": "WARM_PREFIX_TARGET"
"value": "1"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.9.0"
"livenessProbe":
"exec":
"command":
Expand Down Expand Up @@ -198,7 +200,7 @@
- "env":
- "name": "DISABLE_TCP_EARLY_DEMUX"
"value": "false"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:latest"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.9.0"
"name": "aws-vpc-cni-init"
"securityContext":
"privileged": true
Expand Down
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
- "env":
- "name": "USE_CLOUDWATCH"
"value": "true"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:latest"
"image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.9.0"
"name": "cni-metrics-helper"
"serviceAccountName": "cni-metrics-helper"
---
Expand Down
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-us-gov-east-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
- "env":
- "name": "USE_CLOUDWATCH"
"value": "true"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:latest"
"image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.9.0"
"name": "cni-metrics-helper"
"serviceAccountName": "cni-metrics-helper"
---
Expand Down
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper-us-gov-west-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
- "env":
- "name": "USE_CLOUDWATCH"
"value": "true"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:latest"
"image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.9.0"
"name": "cni-metrics-helper"
"serviceAccountName": "cni-metrics-helper"
---
Expand Down
2 changes: 1 addition & 1 deletion config/master/cni-metrics-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
- "env":
- "name": "USE_CLOUDWATCH"
"value": "true"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:latest"
"image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.9.0"
"name": "cni-metrics-helper"
"serviceAccountName": "cni-metrics-helper"
---
Expand Down
2 changes: 1 addition & 1 deletion config/master/manifests.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local objectItems(obj) = [[k, obj[k]] for k in std.objectFields(obj)];

local regions = {
default: {
version:: "latest", // or eg "v1.6.2"
version:: "v1.9.0", // or eg "v1.6.2"
ecrRegion:: "us-west-2",
ecrAccount:: "602401143452",
ecrDomain:: "amazonaws.com",
Expand Down
Loading