From e95d95453667a3b989ecc6a3ef697a85aea967d4 Mon Sep 17 00:00:00 2001 From: Jeff Nelson Date: Mon, 11 Sep 2023 16:48:23 +0000 Subject: [PATCH] Update aws-vpc-cni and cni-metrics-helper charts for v1.15.0 release --- stable/aws-vpc-cni/Chart.yaml | 4 ++-- stable/aws-vpc-cni/README.md | 16 +++++++++------- stable/aws-vpc-cni/templates/clusterrole.yaml | 9 +++++++-- stable/aws-vpc-cni/values.yaml | 4 ++-- stable/cni-metrics-helper/Chart.yaml | 4 ++-- stable/cni-metrics-helper/README.md | 2 +- stable/cni-metrics-helper/values.yaml | 2 +- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/stable/aws-vpc-cni/Chart.yaml b/stable/aws-vpc-cni/Chart.yaml index 18d381d99..3b73da864 100644 --- 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.14.1 -appVersion: "v1.14.1" +version: 1.15.0 +appVersion: "v1.15.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/stable/aws-vpc-cni/README.md b/stable/aws-vpc-cni/README.md index ea4e181e5..fbcbbc525 100644 --- a/stable/aws-vpc-cni/README.md +++ b/stable/aws-vpc-cni/README.md @@ -40,10 +40,10 @@ The following table lists the configurable parameters for this chart and their d | `eniConfig.subnets.id` | The ID of the subnet within the AZ which will be used in the ENIConfig | `nil` | | `eniConfig.subnets.securityGroups` | The IDs of the security groups which will be used in the ENIConfig | `nil` | | `env` | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) | -| `enableWindowsIpam` | Enable windows support for your cluster | `false` | -| `enableNetworkPolicy` | Enable Network Policy Controller and Agent for your cluster | `false` | +| `enableWindowsIpam` | Enable windows support for your cluster | `false` | +| `enableNetworkPolicy` | Enable Network Policy Controller and Agent for your cluster | `false` | | `fullnameOverride` | Override the fullname of the chart | `aws-node` | -| `image.tag` | Image tag | `v1.14.1` | +| `image.tag` | Image tag | `v1.15.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` | @@ -51,7 +51,7 @@ The following table lists the configurable parameters for this chart and their d | `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.14.1` | +| `init.image.tag` | Image tag | `v1.15.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` | @@ -65,12 +65,14 @@ The following table lists the configurable parameters for this chart and their d | `nodeAgent.image.tag` | Image tag for Node Agent | `v1.0.2` | | `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` | | `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` | -| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` | -| `nodeAgent.image.account` | ECR repository account number | `602401143452` | +| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` | +| `nodeAgent.image.account` | ECR repository account number | `602401143452` | | `nodeAgent.image.pullPolicy` | Container pull policy | `IfNotPresent` | | `nodeAgent.securityContext` | Node Agent container Security context | `capabilities: add: - "NET_ADMIN" privileged: true` | | `nodeAgent.enableCloudWatchLogs` | Enable CW logging for Node Agent | `false` | -| `nodeAgent.enableIpv6` +| `nodeAgent.metricsBindAddr` | Node Agent port for metrics | `8162` | +| `nodeAgent.healthProbeBindAddr` | Node Agent port for health probes | `8163` | +| `nodeAgent.enableIpv6` | Enable IPv6 support for Node Agent | `false` | | `extraVolumes` | Array to add extra volumes | `[]` | | `extraVolumeMounts` | Array to add extra mount | `[]` | | `nodeSelector` | Node labels for pod assignment | `{}` | diff --git a/stable/aws-vpc-cni/templates/clusterrole.yaml b/stable/aws-vpc-cni/templates/clusterrole.yaml index cb7c8eebc..90f0959c1 100644 --- a/stable/aws-vpc-cni/templates/clusterrole.yaml +++ b/stable/aws-vpc-cni/templates/clusterrole.yaml @@ -28,7 +28,7 @@ rules: - apiGroups: [""] resources: - nodes - verbs: ["list", "watch", "get", "update"] + verbs: ["list", "watch", "get"] - apiGroups: ["", "events.k8s.io"] resources: - events @@ -40,4 +40,9 @@ rules: - apiGroups: ["networking.k8s.aws"] resources: - policyendpoints/status - verbs: ["get"] \ No newline at end of file + verbs: ["get"] + - apiGroups: + - vpcresources.k8s.aws + resources: + - cninodes + verbs: ["get", "list", "patch"] diff --git a/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml index eba39a9d7..957e3846e 100644 --- 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.14.1 + tag: v1.15.0 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -45,7 +45,7 @@ nodeAgent: healthProbeBindAddr: "8163" image: - tag: v1.14.1 + tag: v1.15.0 domain: amazonaws.com region: us-west-2 endpoint: ecr diff --git a/stable/cni-metrics-helper/Chart.yaml b/stable/cni-metrics-helper/Chart.yaml index a7b82f280..899ea79e9 100644 --- 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: 1.14.1 -appVersion: v1.14.1 +version: 1.15.0 +appVersion: v1.15.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/stable/cni-metrics-helper/README.md b/stable/cni-metrics-helper/README.md index 97bb27074..29bc76f5e 100644 --- a/stable/cni-metrics-helper/README.md +++ b/stable/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.14.1 | +| image.tag | Image tag | v1.15.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 | diff --git a/stable/cni-metrics-helper/values.yaml b/stable/cni-metrics-helper/values.yaml index 19edb2397..eef892add 100644 --- 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.14.1 + tag: v1.15.0 account: "602401143452" domain: "amazonaws.com" # Set to use custom image