Update changelogs and charts for v1.18.0 release (aws#2858)

Co-authored-by: Joseph Chen <chenjoez@amazon.com>
jaydeokar · Sep 26, 2024 · f694f40 · f694f40
1 parent 3fae323
commit f694f40
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,107 +1,5 @@
 # Changelog
 
-## v1.18.3
-
-## What's Changed
-
-* Feature - [cni-metrics-helper] Expose container port when enabling prometheus metrics by @toVersus in https://github.com/aws/amazon-vpc-cni-k8s/pull/2957
-* Feature - Add extraEnv for add additional env from configmap or secrets to aws-node daemonset by @gawsoftpl in https://github.com/aws/amazon-vpc-cni-k8s/pull/2946
-* Feature - Upgrade to latest versions of GitHub actions by @electrocucaracha in https://github.com/aws/amazon-vpc-cni-k8s/pull/2952
-* Feature - use __MTU__ variable for IPv4 egress-cni too by @benben in https://github.com/aws/amazon-vpc-cni-k8s/pull/2951
-
-* Bugfix - Subnet Discovery - Unfilled ENI fix by @jchen6585 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2954
-* Bugfix - Update the APISpec Schema definition for ENIConfig. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2969
-* Bugfix - Use ECR Mirror for Curl Test Image. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2956
-* Bugfix - Add unit test and readme update for POD_MTU/ AWS_VPC_ENI_MTU for Egress plugin behavior. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2979
-* Bugfix - bugfix: templating broken on helm when cniconfig is enabled by @FatPudgeB93 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2983
-* Bugfix - Update vpc_ip_resource_limit.go link in README.md by @kimsehwan96 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2986
-* Bugfix - updating iam doc with subnet policy by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/2992
-
-* Cleanup - Skip Static Canary in run-integration-test in Github. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2935
-* Cleanup - Helpful Make target to login to public ECR. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2934
-* Cleanup - Run Kops Test Separately to triage failures. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2936
-* Cleanup - Update test options default value and help. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2955
-* Cleanup - Refactor static canary tests. by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2966
-
-* Dependency - Update golang to go1.22.3 by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2924
-* Dependency - Bump go.uber.org/zap from 1.26.0 to 1.27.0 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2938
-* Dependency - Bump golang.org/x/sys from 0.19.0 to 0.20.0 in /test/agent by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2937
-* Dependency - Update .go-version to 1.22.4 by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2950
-* Dependency - Bump github.com/containernetworking/cni from 1.1.2 to 1.2.0 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2901
-* Dependency - Bump sigs.k8s.io/controller-runtime from 0.17.0 to 0.18.4 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2962
-* Dependency - Bump k8s.io/cli-runtime from 0.29.0 to 0.30.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2965
-* Dependency - Bump helm.sh/helm/v3 from 3.14.3 to 3.15.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2964
-* Dependency - Bump github.com/aws/aws-sdk-go from 1.51.32 to 1.54.11 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2976
-* Dependency - Bump github.com/go-logr/logr from 1.4.1 to 1.4.2 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2975
-* Dependency - Bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2972
-* Dependency - Bump golang.org/x/sys from 0.20.0 to 0.21.0 in /test/agent by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2977
-* Dependency - Bump github.com/containernetworking/plugins from 1.4.1 to 1.5.1 by @dependabot in https://github.com/aws/amazon-vpc-cni-k8s/pull/2974
-* Dependency - chore: Update .go-version by @orsenthil in https://github.com/aws/amazon-vpc-cni-k8s/pull/2981
-
-## New Contributors
-* @toVersus made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2957
-* @electrocucaracha made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2952
-* @benben made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2951
-* @gawsoftpl made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2946
-* @FatPudgeB93 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2983
-* @kimsehwan96 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2986
-* @yash97 made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2992
-
-**Full Changelog**: https://github.com/aws/amazon-vpc-cni-k8s/compare/v1.18.2...v1.18.3
-
-
-## v1.18.2
-
-* Enhancement - [Improve "cni-metrics-helper" setup experience](https://github.com/aws/amazon-vpc-cni-k8s/pull/2874) (@guessi)
-* Enhancement - [Filter Managed ENI.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2895) (@orsenthil)
-* Enhancement - [Soak Test for CNI.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2915) (@orsenthil)
-* Enhancement - [Switch to counter type metic for awscni_no_available_ip_addresses](https://github.com/aws/amazon-vpc-cni-k8s/pull/2919) (@liptanbiswas)
-* Enhancement - [Expose network policy log file location to be configured using helm](https://github.com/aws/amazon-vpc-cni-k8s/pull/2925) (@orsenthil)
-
-* Bugfix      - [Add correct labels to CNI metrics chart.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2889) (@orsenthil)
-* Bugfix      - [Skip Soak Test while running other tests.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2922) (@orsenthil)
-
-* Cleanup    - [remove unused Dockerfile](https://github.com/aws/amazon-vpc-cni-k8s/pull/2869) (@sushrk)
-* Cleanup    - [CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release](https://github.com/aws/amazon-vpc-cni-k8s/pull/2876) (@jchen6585)
-* Cleanup    - [Fix merge conflicts from release-1.18 to master](https://github.com/aws/amazon-vpc-cni-k8s/pull/2881) (@jchen6585)
-* Cleanup     - [Added information on the build troubleshooting.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2890) (@orsenthil)
-* Cleanup     - [Remove unused code in vpc cni init and vpc cni binary](https://github.com/aws/amazon-vpc-cni-k8s/pull/2891) (@orsenthil)
-* Cleanup     - [Merge release-1.18 to master after v1.18.1 release](https://github.com/aws/amazon-vpc-cni-k8s/pull/2914) (@jchen6585)
-
-* Dependency - [Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2864) (@dependabot)
-* Dependency - [Bump github.com/stretchr/testify from 1.8.4 to 1.9.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2863) (@dependabot)
-* Dependency-  [Bump github.com/prometheus/common from 0.48.0 to 0.52.2](https://github.com/aws/amazon-vpc-cni-k8s/pull/2866) (@dependabot)i
-* Dependency - [Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3](https://github.com/aws/amazon-vpc-cni-k8s/pull/2862) (@dependabot)
-* Dependency - [Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent](https://github.com/aws/amazon-vpc-cni-k8s/pull/2859) (@dependabot)
-* Dependency - [Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2860)  (@dependabot)
-* Dependency - [Update Kops test for 1.30](https://github.com/aws/amazon-vpc-cni-k8s/pull/2868) (@jchen6585)
-* Dependency - [Update .go-version to 1.22.2 to fix CVE reports](https://github.com/aws/amazon-vpc-cni-k8s/pull/2870) (@orsenthil)
-* Dependency  - [Bump golang.org/x/sys from 0.18.0 to 0.19.0 in /test/agent](https://github.com/aws/amazon-vpc-cni-k8s/pull/2898) (@dependabot)
-* Dependency  - [Update .go-version to fix GO-2024-2824](https://github.com/aws/amazon-vpc-cni-k8s/pull/2911) (@orsenthil)
-* Dependency  - [Bump github.com/aws/amazon-vpc-resource-controller-k8s from 1.4.1 to 1.5.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2910) (@dependabot)
-* Dependency  - [Update ENI Limits.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2920) (@orsenthil)
-* Dependency  - [Update golang to go1.22.3](https://github.com/aws/amazon-vpc-cni-k8s/pull/2924) (@orsenthil)
-* Dependency  - [Bump k8s.io/api from 0.29.3 to 0.30.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2918) (@dependabot)
-
-
-**New Contributors**
-
-* @kwohlfahrt made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2841
-* @guessi made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2874
-* @liptanbiswas made their first contribution in https://github.com/aws/amazon-vpc-cni-k8s/pull/2919
-
-## v1.18.1
-
-* Bug - [Mount /run/xtables.lock as FileOrCreate in Helm chart](https://github.com/aws/amazon-vpc-cni-k8s/pull/2841) (@kwohlfahrt)
-* Enhancement - [Update .go-version to 1.22.2 to fix CVE reports.](https://github.com/aws/amazon-vpc-cni-k8s/pull/2870) (@orsenthil)
-* Cleanup - [remove unused Dockerfile](https://github.com/aws/amazon-vpc-cni-k8s/pull/2869) (@sushrk)
-* Dependency - [Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2860) (@dependabot)
-* Dependency - [Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent](https://github.com/aws/amazon-vpc-cni-k8s/pull/2859) (@dependabot)
-* Dependency - [Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3](https://github.com/aws/amazon-vpc-cni-k8s/pull/2862) (@dependabot)
-* Dependency - [Bump github.com/prometheus/common from 0.48.0 to 0.52.2](https://github.com/aws/amazon-vpc-cni-k8s/pull/2866) (@dependabot)
-* Dependency - [Bump github.com/stretchr/testify from 1.8.4 to 1.9.0](https://github.com/aws/amazon-vpc-cni-k8s/pull/2863) (@dependabot)
-* Dependency - [Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1](https://github.com/aws/amazon-vpc-cni-k8s/pull/2864) (@dependabot)
-
 ## v1.18.0
 
 * Cleanup - [run make generate-limits](https://github.com/aws/amazon-vpc-cni-k8s/pull/2835) (@jaydeokar)

diff --git 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.18.3
-appVersion: "v1.18.3"
+version: 1.18.0
+appVersion: "v1.18.0"
 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
@@ -48,15 +48,15 @@ The following table lists the configurable parameters for this chart and their d
 | `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation   | `3`                                 |
 | `branchENICooldown`     | Number of seconds that branch ENIs remain in cooldown   | `60`                                |
 | `fullnameOverride`      | Override the fullname of the chart                      | `aws-node`                          |
-| `image.tag`             | Image tag                                               | `v1.18.3`                           |
+| `image.tag`             | Image tag                                               | `v1.18.0`                           |
 | `image.domain`          | ECR repository domain                                   | `amazonaws.com`                     |
 | `image.region`          | ECR repository region to use. Should match your cluster | `us-west-2`                         |
 | `image.endpoint`        | ECR repository endpoint to use.                         | `ecr`                               |
 | `image.account`         | ECR repository account number                           | `602401143452`                      |
 | `image.pullPolicy`      | Container pull policy                                   | `IfNotPresent`                      |
 | `image.override`        | A custom docker image to use                            | `nil`                               |
 | `imagePullSecrets`      | Docker registry pull secret                             | `[]`                                |
-| `init.image.tag`        | Image tag                                               | `v1.18.3`                           |
+| `init.image.tag`        | Image tag                                               | `v1.18.0`                           |
 | `init.image.domain`     | ECR repository domain                                   | `amazonaws.com`                     |
 | `init.image.region`     | ECR repository region to use. Should match your cluster | `us-west-2`                         |
 | `init.image.endpoint`   | ECR repository endpoint to use.                         | `ecr`                               |

diff --git 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.18.3
+    tag: v1.18.0
     domain: amazonaws.com
     region: us-west-2
     endpoint: ecr
@@ -51,7 +51,7 @@ nodeAgent:
   resources: {}
 
 image:
-  tag: v1.18.3
+  tag: v1.18.0
   domain: amazonaws.com
   region: us-west-2
   endpoint: ecr
@@ -85,7 +85,7 @@ env:
   ENABLE_IPv4: "true"
   ENABLE_IPv6: "false"
   ENABLE_SUBNET_DISCOVERY: "true"
-  VPC_CNI_VERSION: "v1.18.3"
+  VPC_CNI_VERSION: "v1.18.0"
   NETWORK_POLICY_ENFORCING_MODE: "standard"
 
 # Add env from configMap or from secrets

diff --git 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: 1.18.3
-appVersion: v1.18.3
+version: 1.18.0
+appVersion: v1.18.0
 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
@@ -55,34 +55,26 @@ $ helm uninstall cni-metrics-helper --namespace kube-system
 
 The following table lists the configurable parameters for this chart and their default values.
 
-
-| Parameter                      | Description                                                   | Default                             |
-| -------------------------------|---------------------------------------------------------------|-------------------------------------|
-| `affinity`                     | Map of node/pod affinities                                    | `{}`                                |
-| `fullnameOverride`             | Override the fullname of the chart                            | `cni-metrics-helper`                |
-| `image.tag`                    | Image tag                                                     | `v1.18.3`                           |
-| `image.domain`                 | ECR repository domain                                         | `amazonaws.com`                     |
-| `image.region`                 | ECR repository region to use. Should match your cluster       | `us-west-2`                         |
-| `image.account`                | ECR repository account number                                 | `602401143452`                      |
-| `env.USE_CLOUDWATCH`           | Whether to export CNI metrics to CloudWatch                   | `true`                              |
-| `env.USE_PROMETHEUS`           | Whether to export CNI metrics to Prometheus                   | `false`                             |
-| `env.AWS_CLUSTER_ID`           | ID of the cluster to use when exporting metrics to CloudWatch | `default`                           |
-| `env.AWS_VPC_K8S_CNI_LOGLEVEL` | Log verbosity level (ie. FATAL, ERROR, WARN, INFO, DEBUG)     | `INFO`                              |
-| `env.METRIC_UPDATE_INTERVAL`   | Interval at which to update CloudWatch metrics, in seconds.   |                                     |
-|                                | Metrics are published to CloudWatch at 2x the interval        | `30`                                |
-| `serviceAccount.name`          | The name of the ServiceAccount to use                         | `nil`                               |
-| `serviceAccount.create`        | Specifies whether a ServiceAccount should be created          | `true`                              |
-| `serviceAccount.annotations`   | Specifies the annotations for ServiceAccount                  | `{}`                                |
-| `podAnnotations`               | Specifies the annotations for pods                            | `{}`                                |
-| `revisionHistoryLimit`         | The number of revisions to keep                               | `10`                                |
-| `podSecurityContext`           | SecurityContext to set on the pod                             | `{}`                                |
-| `containerSecurityContext`     | SecurityContext to set on the container                       | `{}`                                |
-| `tolerations`                  | Optional deployment tolerations                               | `[]`                                |
-| `updateStrategy`               | Optional update strategy                                      | `{}`                                |
-| `imagePullSecrets`             | Docker registry pull secret                                   | `[]`                                |
-| `nodeSelector`                 | Node labels for pod assignment                                | `{}`                                |
-| `tolerations`                  | Optional deployment tolerations                               | `[]`                                |
-
+| Parameter                    | Description                                                   | Default            |
+|------------------------------|---------------------------------------------------------------|--------------------|
+| 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.18.0            |
+| 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               |
+| env.USE_PROMETHEUS           | Whether to export CNI metrics to Prometheus                   | false              |
+| env.AWS_CLUSTER_ID           | ID of the cluster to use when exporting metrics to CloudWatch | default            |
+| env.AWS_VPC_K8S_CNI_LOGLEVEL | Log verbosity level (ie. FATAL, ERROR, WARN, INFO, DEBUG)     | INFO               |
+| env.METRIC_UPDATE_INTERVAL   | Interval at which to update CloudWatch metrics, in seconds.   |                    |
+|                              | Metrics are published to CloudWatch at 2x the interval        | 30                 |
+| serviceAccount.name          | The name of the ServiceAccount to use                         | nil                |
+| serviceAccount.create        | Specifies whether a ServiceAccount should be created          | true               |
+| serviceAccount.annotations   | Specifies the annotations for ServiceAccount                  | {}                 |
+| podAnnotations               | Specifies the annotations for pods                            | {}                 |
+| revisionHistoryLimit         | The number of revisions to keep                               | 10                 |
+| podSecurityContext           | SecurityContext to set on the pod                             | {}                 |
+| containerSecurityContext     | SecurityContext to set on the container                       | {}                 |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` or provide a YAML file containing the values for the above parameters:
 

diff --git 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.18.3
+  tag: v1.18.0
   account: "602401143452"
   domain: "amazonaws.com"
   # Set to use custom image