From ad8b7afb0c85bc9226767fcaa8a93417c0c11d76 Mon Sep 17 00:00:00 2001 From: Jeff Nelson Date: Fri, 3 Mar 2023 18:23:50 +0000 Subject: [PATCH] update master branch for v1.12.5 release --- CHANGELOG.md | 18 ++++++++++++++++++ charts/aws-vpc-cni/Chart.yaml | 2 +- charts/aws-vpc-cni/README.md | 4 ++-- charts/aws-vpc-cni/values.yaml | 4 ++-- charts/cni-metrics-helper/Chart.yaml | 4 ++-- charts/cni-metrics-helper/README.md | 2 +- charts/cni-metrics-helper/values.yaml | 2 +- config/master/aws-k8s-cni-cn.yaml | 12 ++++++------ config/master/aws-k8s-cni-us-gov-east-1.yaml | 12 ++++++------ config/master/aws-k8s-cni-us-gov-west-1.yaml | 12 ++++++------ config/master/aws-k8s-cni.yaml | 12 ++++++------ config/master/cni-metrics-helper-cn.yaml | 6 +++--- .../cni-metrics-helper-us-gov-east-1.yaml | 6 +++--- .../cni-metrics-helper-us-gov-west-1.yaml | 6 +++--- config/master/cni-metrics-helper.yaml | 6 +++--- 15 files changed, 63 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11a1797136..ce42e5cf52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## v1.12.5 + +* Bug - [Handle private IP exceeded error](https://github.com/aws/amazon-vpc-cni-k8s/pull/2210) (@jayanthvn ) +* Documentation - [doc: document AWS_VPC_K8S_CNI_LOGLEVEL for cni-metric-helper helm chart](https://github.com/aws/amazon-vpc-cni-k8s/pull/2226) (@csantanapr ) +* Documentation - [Added cni-metrics-helper docs](https://github.com/aws/amazon-vpc-cni-k8s/pull/2187) (@0xquark ) +* Improvement - [Update golang builder image](https://github.com/aws/amazon-vpc-cni-k8s/pull/2255) (@jdn5126 ) +* Improvement - [Update golang builder image](https://github.com/aws/amazon-vpc-cni-k8s/pull/2271) (@jdn5126 ) +* Improvement - [run make generate-limits](https://github.com/aws/amazon-vpc-cni-k8s/pull/2235) (@jdn5126 ) +* Improvement - [Add M7g, R7g instance](https://github.com/aws/amazon-vpc-cni-k8s/pull/2250) (@Issacwww ) +* Improvement - [Update client-go and k8s packages](https://github.com/aws/amazon-vpc-cni-k8s/pull/2204) (@jaydeokar ) +* Improvement - [Refactor cni-metrics-helper chart for eks charts release](https://github.com/aws/amazon-vpc-cni-k8s/pull/2201) (@jdn5126 ) +* Improvement - [fix: Upgrade to golang.org/x/net@v0.7.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2273) (@ellistarn ) + +## v1.12.2 + +* Bug - [Cherry-pick prometheus/client_golang module update to address CVE](https://github.com/aws/amazon-vpc-cni-k8s/pull/2239) (@jdn5126 ) +* Improvement - [Minimal base image for cni-metrics-helper minimal base image](https://github.com/aws/amazon-vpc-cni-k8s/pull/2189) (@jdn5126 ) + ## v1.12.1 * Bug - [Cleanup pod networking resources when IPAMD is unreachable to prevent rule leaking.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2145) (@jdn5126 ) diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml index 64edb6310d..3d1bfaa892 100644 --- a/charts/aws-vpc-cni/Chart.yaml +++ b/charts/aws-vpc-cni/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-vpc-cni version: 1.2.7 -appVersion: "v1.12.1" +appVersion: "v1.12.5" 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 diff --git a/charts/aws-vpc-cni/README.md b/charts/aws-vpc-cni/README.md index e6673242a8..f602a72809 100644 --- a/charts/aws-vpc-cni/README.md +++ b/charts/aws-vpc-cni/README.md @@ -42,14 +42,14 @@ The following table lists the configurable parameters for this chart and their d | `env` | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) | | `fullnameOverride` | Override the fullname of the chart | `aws-node` | | `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | -| `image.tag` | Image tag | `v1.12.1` | +| `image.tag` | Image tag | `v1.12.5` | | `image.account` | ECR repository account number | `602401143452` | | `image.domain` | ECR repository domain | `amazonaws.com` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `image.override` | A custom docker image to use | `nil` | | `imagePullSecrets` | Docker registry pull secret | `[]` | | `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | -| `init.image.tag` | Image tag | `v1.12.1` | +| `init.image.tag` | Image tag | `v1.12.5` | | `init.image.account` | ECR repository account number | `602401143452` | | `init.image.domain` | ECR repository domain | `amazonaws.com` | | `init.image.pullPolicy` | Container pull policy | `IfNotPresent` | diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml index 25e81f231c..576d7ce4e2 100644 --- a/charts/aws-vpc-cni/values.yaml +++ b/charts/aws-vpc-cni/values.yaml @@ -8,7 +8,7 @@ nameOverride: aws-node init: image: - tag: v1.12.1 + tag: v1.12.5 region: us-west-2 account: "602401143452" pullPolicy: Always @@ -23,7 +23,7 @@ init: image: region: us-west-2 - tag: v1.12.1 + tag: v1.12.5 account: "602401143452" domain: "amazonaws.com" pullPolicy: Always diff --git a/charts/cni-metrics-helper/Chart.yaml b/charts/cni-metrics-helper/Chart.yaml index 418679f84a..a5c4ae5c9c 100644 --- a/charts/cni-metrics-helper/Chart.yaml +++ b/charts/cni-metrics-helper/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: cni-metrics-helper -version: 0.1.16 -appVersion: v1.12.1 +version: 0.1.17 +appVersion: v1.12.5 description: A Helm chart for the AWS VPC CNI Metrics Helper icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png home: https://github.com/aws/amazon-vpc-cni-k8s diff --git a/charts/cni-metrics-helper/README.md b/charts/cni-metrics-helper/README.md index 5dc51cbfcc..1d346e677f 100644 --- a/charts/cni-metrics-helper/README.md +++ b/charts/cni-metrics-helper/README.md @@ -47,7 +47,7 @@ The following table lists the configurable parameters for this chart and their d |------------------------------|---------------------------------------------------------------|--------------------| | fullnameOverride | Override the fullname of the chart | cni-metrics-helper | | image.region | ECR repository region to use. Should match your cluster | us-west-2 | -| image.tag | Image tag | v1.12.1 | +| image.tag | Image tag | v1.12.5 | | image.account | ECR repository account number | 602401143452 | | image.domain | ECR repository domain | amazonaws.com | | env.USE_CLOUDWATCH | Whether to export CNI metrics to CloudWatch | true | diff --git a/charts/cni-metrics-helper/values.yaml b/charts/cni-metrics-helper/values.yaml index ac4456f890..ac4bb58056 100644 --- a/charts/cni-metrics-helper/values.yaml +++ b/charts/cni-metrics-helper/values.yaml @@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper image: region: us-west-2 - tag: v1.12.1 + tag: v1.12.5 account: "602401143452" domain: "amazonaws.com" # Set to use custom image diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml index e0e8b21cc7..1f086df529 100644 --- a/config/master/aws-k8s-cni-cn.yaml +++ b/config/master/aws-k8s-cni-cn.yaml @@ -32,7 +32,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -43,7 +43,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -76,7 +76,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -96,7 +96,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" spec: updateStrategy: rollingUpdate: @@ -117,7 +117,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.12.1" + image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.12.5" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -138,7 +138,7 @@ spec: {} containers: - name: aws-node - image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.12.1" + image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.12.5" ports: - containerPort: 61678 name: metrics diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml index 2489fea6e6..c042358be0 100644 --- a/config/master/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml @@ -32,7 +32,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -43,7 +43,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -76,7 +76,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -96,7 +96,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" spec: updateStrategy: rollingUpdate: @@ -117,7 +117,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.12.1" + image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.12.5" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -138,7 +138,7 @@ spec: {} containers: - name: aws-node - image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.12.1" + image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.12.5" ports: - containerPort: 61678 name: metrics diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml index 9baf819077..483f84e195 100644 --- a/config/master/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml @@ -32,7 +32,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -43,7 +43,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -76,7 +76,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -96,7 +96,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" spec: updateStrategy: rollingUpdate: @@ -117,7 +117,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.12.1" + image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni-init:v1.12.5" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -138,7 +138,7 @@ spec: {} containers: - name: aws-node - image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.12.1" + image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.12.5" ports: - containerPort: 61678 name: metrics diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml index 784da84784..7e161e6fae 100644 --- a/config/master/aws-k8s-cni.yaml +++ b/config/master/aws-k8s-cni.yaml @@ -32,7 +32,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: aws-vpc-cni/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -43,7 +43,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -76,7 +76,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -96,7 +96,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.12.1" + app.kubernetes.io/version: "v1.12.5" spec: updateStrategy: rollingUpdate: @@ -117,7 +117,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.1" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -138,7 +138,7 @@ spec: {} containers: - name: aws-node - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.1" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5" ports: - containerPort: 61678 name: metrics diff --git a/config/master/cni-metrics-helper-cn.yaml b/config/master/cni-metrics-helper-cn.yaml index d2bc8128bf..7cf0a9a3d5 100644 --- a/config/master/cni-metrics-helper-cn.yaml +++ b/config/master/cni-metrics-helper-cn.yaml @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.12.1" + image: "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.12.5" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper-us-gov-east-1.yaml b/config/master/cni-metrics-helper-us-gov-east-1.yaml index fdc939e0ea..2b38499af1 100644 --- a/config/master/cni-metrics-helper-us-gov-east-1.yaml +++ b/config/master/cni-metrics-helper-us-gov-east-1.yaml @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.12.1" + image: "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.12.5" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper-us-gov-west-1.yaml b/config/master/cni-metrics-helper-us-gov-west-1.yaml index 3cc4afd000..3c41c29911 100644 --- a/config/master/cni-metrics-helper-us-gov-west-1.yaml +++ b/config/master/cni-metrics-helper-us-gov-west-1.yaml @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -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.12.1" + image: "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.12.5" serviceAccountName: cni-metrics-helper diff --git a/config/master/cni-metrics-helper.yaml b/config/master/cni-metrics-helper.yaml index a686e26884..410d135b26 100644 --- a/config/master/cni-metrics-helper.yaml +++ b/config/master/cni-metrics-helper.yaml @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" --- # Source: cni-metrics-helper/templates/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -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.12.1" + app.kubernetes.io/version: "v1.12.5" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -64,5 +64,5 @@ spec: - name: USE_CLOUDWATCH value: "true" name: cni-metrics-helper - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.12.1" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.12.5" serviceAccountName: cni-metrics-helper