v1.12.2 chart release for VPC CNI (#896)

aws · Feb 3, 2023 · 12b35fb · 12b35fb
1 parent 0576e75
commit 12b35fb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/stable/aws-vpc-cni/Chart.yaml b/stable/aws-vpc-cni/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.2.2
-appVersion: "v1.12.1"
+version: 1.2.6
+appVersion: "v1.12.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

diff --git a/stable/aws-vpc-cni/README.md b/stable/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.2`                           |
 | `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.2`                           |
 | `init.image.account`    | ECR repository account number                           | `602401143452`                      |
 | `init.image.domain`     | ECR repository domain                                   | `amazonaws.com`                     |
 | `init.image.pullPolicy` | Container pull policy                                   | `IfNotPresent`                      |
@@ -91,7 +91,6 @@ WARNING: Substitute YOUR_HELM_RELEASE_NAME_HERE with the name of your helm relea
 
 set -euo pipefail
 
-# don't import the crd. Helm cant manage the lifecycle of it anyway.
 for kind in daemonSet clusterRole clusterRoleBinding serviceAccount; do
   echo "setting annotations and labels on $kind/aws-node"
   kubectl -n kube-system annotate --overwrite $kind aws-node meta.helm.sh/release-name=YOUR_HELM_RELEASE_NAME_HERE

diff --git a/stable/aws-vpc-cni/templates/daemonset.yaml b/stable/aws-vpc-cni/templates/daemonset.yaml
@@ -91,8 +91,8 @@ spec:
           - mountPath: /host/etc/cni/net.d
             name: cni-net-dir
 {{- if .Values.cniConfig.enabled }}
-            # the dockerfile copies the baked in config to this location, lets overwrite it with ours
-            # the entrypoint.sh script will then copy our config to /host/etc/cni/net.d on boot
+            # The dockerfile copies the baked in config to this location, so overwrite it with ours.
+            # The entrypoint process will then copy our config to /host/etc/cni/net.d on boot.
           - name: cni-config
             mountPath: /app/10-aws.conflist
             subPath: 10-aws.conflist

diff --git a/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml
@@ -8,7 +8,7 @@ nameOverride: aws-node
 
 init:
   image:
-    tag: v1.12.1
+    tag: v1.12.2
     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.2
   account: "602401143452"   
   domain: "amazonaws.com"  
   pullPolicy: Always

diff --git a/stable/cni-metrics-helper/Chart.yaml b/stable/cni-metrics-helper/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cni-metrics-helper
-version: 0.1.15
-appVersion: v1.12.1
+version: 0.1.16
+appVersion: v1.12.2
 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/stable/cni-metrics-helper/README.md b/stable/cni-metrics-helper/README.md
@@ -43,20 +43,19 @@ $ 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            |
-|----------------------------|---------------------------------------------------------------|--------------------|
-| 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.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.AWS_CLUSTER_ID         | ID of the cluster to use when exporting metrics to CloudWatch | default            |
-| 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                  | {}                 |
+| 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.12.2            |
+| 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.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               |
+| 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                  | {}                 |
 
 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/stable/cni-metrics-helper/values.yaml b/stable/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.2
   account: "602401143452"
   domain: "amazonaws.com"   
   # Set to use custom image
@@ -13,6 +13,7 @@ image:
 env:
   USE_CLOUDWATCH: "true"
   AWS_CLUSTER_ID: ""
+  AWS_VPC_K8S_CNI_LOGLEVEL: "INFO"
 
 fullnameOverride: "cni-metrics-helper"