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.

Sign up for GitHub

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

Update release manifests for VPC CNI v1.11.2 #2001

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Update release manifests for VPC CNI v1.11.2 #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
510f3a6
Update release manifests for VPC CNI v1.11.2
orsenthil Jun 3, 2022
ecbc11d
Update cni metrics helper.
orsenthil Jun 3, 2022
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

## v1.11.2

* Improvement - [Update golang to Go 1.18](https://github.com/aws/amazon-vpc-cni-k8s/pull/1991) (@orsenthil)
* Improvement - [Update containernetworking/cni version to 0.8.1 to address CVE-2021-20206](https://github.com/aws/amazon-vpc-cni-k8s/pull/1996) (@orsenthil)
* Improvement - [Updated golang to Go 1.18](https://github.com/aws/amazon-vpc-cni-k8s/pull/1991) (@orsenthil)
* Improvement - [Updated containernetworking/cni version to 0.8.1 to address CVE-2021-20206](https://github.com/aws/amazon-vpc-cni-k8s/pull/1996) (@orsenthil)
* Improvement - [Updated CNI Plugins to v1.1.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/1997) (@orsenthil)

# v1.11.1

Expand Down
2 changes: 1 addition & 1 deletion charts/aws-vpc-cni/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-vpc-cni
version: 1.1.17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the version already bumped up from v1.11.0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it was. We didn't release the previous v1.11.1

The chart version is already updated as previous chart was not released.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous one is 1.1.16 (https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.11.0/charts/aws-vpc-cni/Chart.yaml#L3) and current one is 1.1.17

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And yeah, cni-metrics-helper/chart is updated too - https://github.com/orsenthil/amazon-vpc-cni-k8s/blob/update_release_manifests_1.12/charts/cni-metrics-helper/Chart.yaml#L18

Previous one is version: 0.1.8 and current one is 0.1.9

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the diff here in this PR for charts/cni-metrics-helper. Also appVersion needs to be bumped to 1.11.2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very strange to me. The ag command didn't include it.

[senthilx@88665a371033:~/go/src/github.com/aws/amazon-vpc-cni-k8s]$ ag v1.11.1 -l
test/go.sum
CHANGELOG.md
config/master/cni-metrics-helper-cn.yaml
config/master/aws-k8s-cni-us-gov-west-1.yaml
config/master/cni-metrics-helper-us-gov-west-1.yaml
config/master/aws-k8s-cni.yaml
config/master/cni-metrics-helper-us-gov-east-1.yaml
config/master/aws-k8s-cni-cn.yaml
config/master/cni-metrics-helper.yaml
config/master/aws-k8s-cni-us-gov-east-1.yaml
charts/aws-vpc-cni/Chart.yaml
charts/aws-vpc-cni/values.yaml
[senthilx@88665a371033:~/go/src/github.com/aws/amazon-vpc-cni-k8s]$ cd charts/
/Users/senthilx/go/src/github.com/aws/amazon-vpc-cni-k8s/charts
[senthilx@88665a371033:~/go/src/github.com/aws/amazon-vpc-cni-k8s/charts]$ ag v1.11.1 -l
cni-metrics-helper/Chart.yaml
cni-metrics-helper/values.yaml
aws-vpc-cni/Chart.yaml
aws-vpc-cni/values.yaml

I will update.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. I see that. It is because of exclusion of cni-metrics-helper in the gitignore.

$ cat .gitignore
aws-k8s-agent
aws-cni
verify-aws
verify-network
*~
*.swp
.idea/
*.iml
.DS_Store
portmap
grpc-health-probe
cni-metrics-helper
coverage.txt
build/
vendor

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's update the .gitignore and remove the cni-metrics-helper separately.

The following paths are ignored by one of your .gitignore files:
charts/cni-metrics-helper

The version of cni-metrics-helper chart is now updated.

appVersion: "v1.11.1"
appVersion: "v1.11.2"
description: A Helm chart for the AWS VPC CNI
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
home: https://github.com/aws/amazon-vpc-cni-k8s
Expand Down
4 changes: 2 additions & 2 deletions charts/aws-vpc-cni/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nameOverride: aws-node

init:
image:
tag: v1.11.1
tag: v1.11.2
region: us-west-2
account: "602401143452"
pullPolicy: Always
Expand All @@ -23,7 +23,7 @@ init:

image:
region: us-west-2
tag: v1.11.1
tag: v1.11.2
account: "602401143452"
domain: "amazonaws.com"
pullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion charts/cni-metrics-helper/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ version: 0.1.9
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: v1.11.1
appVersion: v1.11.2
2 changes: 1 addition & 1 deletion charts/cni-metrics-helper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper

image:
region: us-west-2
tag: v1.11.1
tag: v1.11.2
account: "602401143452"
domain: "amazonaws.com"
# Set to use custom image
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-cn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -80,7 +80,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -100,7 +100,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -121,7 +121,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.2"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.2"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-us-gov-east-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -80,7 +80,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -100,7 +100,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -121,7 +121,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.2"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.11.1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.11.2"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni-us-gov-west-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -80,7 +80,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -100,7 +100,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -121,7 +121,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.11.1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.11.2"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.11.1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.11.2"
ports:
- containerPort: 61678
name: metrics
Expand Down
14 changes: 7 additions & 7 deletions config/master/aws-k8s-cni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
Expand All @@ -20,7 +20,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
Expand All @@ -47,7 +47,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
Expand Down Expand Up @@ -80,7 +80,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -100,7 +100,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
spec:
updateStrategy:
rollingUpdate:
Expand All @@ -121,7 +121,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.1"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.2"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
Expand All @@ -139,7 +139,7 @@ spec:
{}
containers:
- name: aws-node
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.1"
image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.2"
ports:
- containerPort: 61678
name: metrics
Expand Down
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-cn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.11.1"
image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.11.2"
serviceAccountName: cni-metrics-helper
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-us-gov-east-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.11.1"
image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.11.2"
serviceAccountName: cni-metrics-helper
6 changes: 3 additions & 3 deletions config/master/cni-metrics-helper-us-gov-west-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
---
# Source: cni-metrics-helper/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -30,7 +30,7 @@ metadata:
labels:
app.kubernetes.io/name: cni-metrics-helper
app.kubernetes.io/instance: cni-metrics-helper
app.kubernetes.io/version: "v1.11.1"
app.kubernetes.io/version: "v1.11.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
- name: USE_CLOUDWATCH
value: "true"
name: cni-metrics-helper
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.11.1"
image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.11.2"
serviceAccountName: cni-metrics-helper
Loading