From fdc7876acc95c20b2b572540168d462209ddd2bd Mon Sep 17 00:00:00 2001 From: "june.i" Date: Thu, 25 May 2023 15:27:05 +0900 Subject: [PATCH 01/17] Add template high performance kinesis stream plugin --- stable/aws-for-fluent-bit/Chart.yaml | 2 +- stable/aws-for-fluent-bit/README.md | 9 ++++++ .../templates/configmap.yaml | 32 +++++++++++++++++++ stable/aws-for-fluent-bit/values.yaml | 14 ++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/Chart.yaml b/stable/aws-for-fluent-bit/Chart.yaml index 0b0d1bf58..c3211212c 100644 --- a/stable/aws-for-fluent-bit/Chart.yaml +++ b/stable/aws-for-fluent-bit/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-for-fluent-bit description: A Helm chart to deploy aws-for-fluent-bit project -version: 0.1.24 +version: 0.1.25 appVersion: 2.28.4 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index ffffda1cc..c7f30fbaa 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,6 +91,15 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | +| `kinesis_streams.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) | `false` | ✔ +| `kinesis_streams.region` | The AWS region. | ✔ +| `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ +| `kinesis_streams.sts_endpoint` | Custom endpoint for the STS API. `kinesis_streams.sts_endpoint`. | | +| `kinesis_streams.time_key` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | +| `kinesis_streams.time_key_format` | strftime compliant format string for the timestamp; for example, the default is `%Y-%m-%dT%H:%M:%S`. Supports millisecond precision with `%3N` and supports nanosecond precision with `%9N` and `%L`; for example, adding `%3N` to support millisecond `%Y-%m-%dT%H:%M:%S.%3N`. This option is used with `time_key`. | | +| `kinesis_streams.log_key` | By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify `log_key` `log` and only the log message will be sent to Kinesis. | | +| `kinesis_streams.auto_retry_requests` | Immediately retry failed requests to AWS services once. This option does not affect the normal Fluent Bit retry mechanism with backoff. Instead, it enables an immediate retry with no delay for networking errors, which may help improve throughput when there are transient/random networking issues. This option defaults to `true`. | | +| `kinesis_streams.external_id` | Specify an external ID for the STS API, can be used with the role_arn parameter if your role requries an external ID. | | | `kinesis.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) | `false` | ✔ | `kinesis.match` | The log filter | `"*"` | ✔ | `kinesis.region` | The region which your Kinesis Data Stream is in. | `"us-east-1"` | ✔ diff --git a/stable/aws-for-fluent-bit/templates/configmap.yaml b/stable/aws-for-fluent-bit/templates/configmap.yaml index de8d6b375..4f9eb5136 100755 --- a/stable/aws-for-fluent-bit/templates/configmap.yaml +++ b/stable/aws-for-fluent-bit/templates/configmap.yaml @@ -232,6 +232,38 @@ data: {{- end }} {{- end }} +{{- if .Values.kinesis_streams.enabled }} + [OUTPUT] + Name kinesis_streams + Match {{ .Values.kinesis_streams.match }} + region {{ .Values.kinesis_streams.region }} + stream {{ .Values.kinesis_streams.stream }} + {{- if .Values.kinesis_streams.role_arn }} + role_arn {{ .Values.kinesis_streams.role_arn }} + {{- end }} + {{- if .Values.kinesis_streams.endpoint }} + endpoint {{ .Values.kinesis_streams.endpoint }} + {{- end }} + {{- if .Values.kinesis_streams.sts_endpoint }} + sts_endpoint {{ .Values.kinesis_streams.sts_endpoint }} + {{- end }} + {{- if .Values.kinesis_streams.time_key }} + time_key {{ .Values.kinesis_streams.time_key }} + {{- end }} + {{- if .Values.kinesis_streams.time_key_format }} + time_key_format {{ .Values.kinesis_streams.time_key_format }} + {{- end }} + {{- if .Values.kinesis_streams.external_id }} + time_key_format {{ .Values.kinesis_streams.external_id }} + {{- end }} + {{- if .Values.kinesis_streams.auto_retry_requests }} + time_key_format {{ .Values.kinesis_streams.auto_retry_requests }} + {{- end }} + {{- if .Values.kinesis_streames.log_key }} + log_key {{ .Values.kinesis_streams.log_key }} + {{- end }} +{{- end }} + {{- if .Values.elasticsearch.enabled }} [OUTPUT] Name es diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml index 043fc3cb4..4e18e99d7 100644 --- a/stable/aws-for-fluent-bit/values.yaml +++ b/stable/aws-for-fluent-bit/values.yaml @@ -162,6 +162,20 @@ kinesis: # extraOutputs: | # ... +kinesis_streams: + enabled: false + match: "*" + region: "us-east-1" + stream: "my-kinesis-stream-name" + role_arn: + endpoint: + sts_endpoint: + time_key: + time_key_format: + external_id: + auto_retry_requests: + log_key: + elasticsearch: enabled: false match: "*" From 1ff8e61f7d245eb69ed0c804a2e8bf995028d2b8 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Fri, 26 May 2023 14:37:23 +0900 Subject: [PATCH 02/17] update readme.md --- stable/aws-for-fluent-bit/README.md | 2 ++ stable/aws-for-fluent-bit/values.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index c7f30fbaa..365c59553 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -94,6 +94,8 @@ helm delete aws-for-fluent-bit --namespace kube-system | `kinesis_streams.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ +| `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | +| `kinesis_streams.role_arn` | ARN of an IAM role to assume (for cross account access). | | | `kinesis_streams.sts_endpoint` | Custom endpoint for the STS API. `kinesis_streams.sts_endpoint`. | | | `kinesis_streams.time_key` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `kinesis_streams.time_key_format` | strftime compliant format string for the timestamp; for example, the default is `%Y-%m-%dT%H:%M:%S`. Supports millisecond precision with `%3N` and supports nanosecond precision with `%9N` and `%L`; for example, adding `%3N` to support millisecond `%Y-%m-%dT%H:%M:%S.%3N`. This option is used with `time_key`. | | diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml index 4e18e99d7..59d34dfca 100644 --- a/stable/aws-for-fluent-bit/values.yaml +++ b/stable/aws-for-fluent-bit/values.yaml @@ -173,7 +173,7 @@ kinesis_streams: time_key: time_key_format: external_id: - auto_retry_requests: + auto_retry_requests: log_key: elasticsearch: From 4af7cdad52d1d68991f296841f8557c5a8c3f217 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Fri, 26 May 2023 14:40:46 +0900 Subject: [PATCH 03/17] update readme kinesis streams url --- stable/aws-for-fluent-bit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index 365c59553..e5bbcf8c5 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,7 +91,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | -| `kinesis_streams.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) | `false` | ✔ +| `kinesis_streams.enabled` | It has all the core features of the `aws/amazon-kinesis-streams-for-fluent-bit` Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | From 84ebee03d992da215147649d6edd6337445040ec Mon Sep 17 00:00:00 2001 From: "june.i" Date: Thu, 1 Jun 2023 10:42:11 +0900 Subject: [PATCH 04/17] update reademe --- stable/aws-for-fluent-bit/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index e5bbcf8c5..976a8e9fe 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,7 +91,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | -| `kinesis_streams.enabled` | It has all the core features of the `aws/amazon-kinesis-streams-for-fluent-bit` Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ +| `kinesis_streams.enabled` | It has all the core features of the [aws/amazon-kinesis-streams-for-fluent-bit](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit#how-can-i-migrate-to-the-higher-performance-plugin) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | @@ -99,7 +99,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `kinesis_streams.sts_endpoint` | Custom endpoint for the STS API. `kinesis_streams.sts_endpoint`. | | | `kinesis_streams.time_key` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `kinesis_streams.time_key_format` | strftime compliant format string for the timestamp; for example, the default is `%Y-%m-%dT%H:%M:%S`. Supports millisecond precision with `%3N` and supports nanosecond precision with `%9N` and `%L`; for example, adding `%3N` to support millisecond `%Y-%m-%dT%H:%M:%S.%3N`. This option is used with `time_key`. | | -| `kinesis_streams.log_key` | By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify `log_key` `log` and only the log message will be sent to Kinesis. | | +| `kinesis_streams.log_key` | By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify `log_key log` and only the log message will be sent to Kinesis. | | | `kinesis_streams.auto_retry_requests` | Immediately retry failed requests to AWS services once. This option does not affect the normal Fluent Bit retry mechanism with backoff. Instead, it enables an immediate retry with no delay for networking errors, which may help improve throughput when there are transient/random networking issues. This option defaults to `true`. | | | `kinesis_streams.external_id` | Specify an external ID for the STS API, can be used with the role_arn parameter if your role requries an external ID. | | | `kinesis.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) | `false` | ✔ From b0e43ad29fb206decd5b316ce2b78e80e1955a05 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Thu, 1 Jun 2023 10:44:28 +0900 Subject: [PATCH 05/17] fix typo --- stable/aws-for-fluent-bit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index 976a8e9fe..2590ab885 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,7 +91,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | -| `kinesis_streams.enabled` | It has all the core features of the [aws/amazon-kinesis-streams-for-fluent-bit](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit#how-can-i-migrate-to-the-higher-performance-plugin) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ +| `kinesis_streams.enabled` | It has all the core features of the [aws/amazon-kinesis-streams-for-fluent-bit](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | From f190f4905186c59ff07243c3fec97094ba89b9c6 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Thu, 1 Jun 2023 10:47:52 +0900 Subject: [PATCH 06/17] rename readme.md url name --- stable/aws-for-fluent-bit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index 2590ab885..8d7d9795b 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,7 +91,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | -| `kinesis_streams.enabled` | It has all the core features of the [aws/amazon-kinesis-streams-for-fluent-bit](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ +| `kinesis_streams.enabled` | It has all the core features of the [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | From 0702f25a99df9c2df6008cf0ba98a0d9656165de Mon Sep 17 00:00:00 2001 From: "june.i" Date: Thu, 1 Jun 2023 11:44:26 +0900 Subject: [PATCH 07/17] fix typo --- stable/aws-for-fluent-bit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index 8d7d9795b..ec34f2be6 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -91,7 +91,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `firehose.timeKey` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `firehose.timeKeyFormat` | strftime compliant format string for the timestamp; for example, `%Y-%m-%dT%H:%M:%S%z`. This option is used with `time_key`. | | | `firehose.extraOutputs` | Append extra outputs with value | `""` | -| `kinesis_streams.enabled` | It has all the core features of the [details](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ +| `kinesis_streams.enabled` | It has all the core features of the [documentation](https://github.com/aws/amazon-kinesis-streams-for-fluent-bit) Golang Fluent Bit plugin released in 2019. The Golang plugin was named `kinesis`; this new high performance and highly efficient kinesis plugin is called `kinesis_streams` to prevent conflicts/confusion, [details](https://docs.fluentbit.io/manual/pipeline/outputs/kinesis) | `false` | ✔ | `kinesis_streams.region` | The AWS region. | ✔ | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | From e9d951d2f383b22e7695eb718ed46244d7ea9406 Mon Sep 17 00:00:00 2001 From: Jeffrey Nelson Date: Fri, 2 Jun 2023 15:22:43 -0500 Subject: [PATCH 08/17] chart updates for VPC CNI v1.13.0 release (#952) --- stable/aws-vpc-cni/Chart.yaml | 4 ++-- stable/aws-vpc-cni/README.md | 18 ++++++++------- stable/aws-vpc-cni/templates/_helpers.tpl | 22 +++++++++++++++++++ stable/aws-vpc-cni/templates/clusterrole.yaml | 4 ---- stable/aws-vpc-cni/templates/daemonset.yaml | 16 ++++++++------ stable/aws-vpc-cni/values.yaml | 15 ++++++++----- stable/cni-metrics-helper/Chart.yaml | 4 ++-- stable/cni-metrics-helper/README.md | 4 +++- stable/cni-metrics-helper/values.yaml | 2 +- 9 files changed, 59 insertions(+), 30 deletions(-) diff --git a/stable/aws-vpc-cni/Chart.yaml b/stable/aws-vpc-cni/Chart.yaml index 32a4bee0f..95188cdc5 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.2.8 -appVersion: "v1.12.6" +version: 1.13.0 +appVersion: "v1.13.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 2ecd2a148..2ed38a5bb 100644 --- a/stable/aws-vpc-cni/README.md +++ b/stable/aws-vpc-cni/README.md @@ -18,7 +18,7 @@ helm repo add eks https://aws.github.io/eks-charts To install the chart with the release name `aws-vpc-cni` and default configuration: ```shell -$ helm install --name aws-vpc-cni --namespace kube-system eks/aws-vpc-cni +$ helm install aws-vpc-cni --namespace kube-system eks/aws-vpc-cni ``` To install into an EKS cluster where the CNI is already installed, see [this section below](#adopting-the-existing-aws-node-resources-in-an-eks-cluster) @@ -41,17 +41,19 @@ The following table lists the configurable parameters for this chart and their d | `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`) | | `fullnameOverride` | Override the fullname of the chart | `aws-node` | +| `image.tag` | Image tag | `v1.13.0` | +| `image.domain` | ECR repository domain | `amazonaws.com` | | `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` | -| `image.tag` | Image tag | `v1.12.6` | +| `image.endpoint` | ECR repository endpoint to use. | `ecr` | | `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.tag` | Image tag | `v1.13.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.tag` | Image tag | `v1.12.6` | +| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` | | `init.image.account` | ECR repository account number | `602401143452` | -| `init.image.domain` | ECR repository domain | `amazonaws.com` | | `init.image.pullPolicy` | Container pull policy | `IfNotPresent` | | `init.image.override` | A custom docker image to use | `nil` | | `init.env` | List of init container environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) | @@ -65,20 +67,20 @@ The following table lists the configurable parameters for this chart and their d | `podAnnotations` | annotations to add to each pod | `{}` | | `podLabels` | Labels to add to each pod | `{}` | | `priorityClassName` | Name of the priorityClass | `system-node-critical` | -| `resources` | Resources for the pods | `requests.cpu: 10m` | +| `resources` | Resources for containers in pod | `requests.cpu: 25m` | | `securityContext` | Container Security context | `capabilities: add: - "NET_ADMIN" - "NET_RAW"` | | `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 | `{}` | | `livenessProbe` | Livenness probe settings for daemonset | (see `values.yaml`) | | `readinessProbe` | Readiness probe settings for daemonset | (see `values.yaml`) | -| `tolerations` | Optional deployment tolerations | `[]` | +| `tolerations` | Optional deployment tolerations | `[{"operator": "Exists"}]` | | `updateStrategy` | Optional update strategy | `type: RollingUpdate` | 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: ```shell -$ helm install --name aws-vpc-cni --namespace kube-system eks/aws-vpc-cni --values values.yaml +$ helm install aws-vpc-cni --namespace kube-system eks/aws-vpc-cni --values values.yaml ``` ## Adopting the existing aws-node resources in an EKS cluster diff --git a/stable/aws-vpc-cni/templates/_helpers.tpl b/stable/aws-vpc-cni/templates/_helpers.tpl index 230aed771..591b09797 100644 --- a/stable/aws-vpc-cni/templates/_helpers.tpl +++ b/stable/aws-vpc-cni/templates/_helpers.tpl @@ -55,3 +55,25 @@ Create the name of the service account to use {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} + +{{/* +The aws-vpc-cni-init image to use +*/}} +{{- define "aws-vpc-cni.initImage" -}} +{{- if .Values.init.image.override }} +{{- .Values.init.image.override }} +{{- else }} +{{- printf "%s.dkr.%s.%s.%s/amazon-k8s-cni-init:%s" .Values.init.image.account .Values.init.image.endpoint .Values.init.image.region .Values.init.image.domain .Values.init.image.tag }} +{{- end }} +{{- end }} + +{{/* +The aws-vpc-cni image to use +*/}} +{{- define "aws-vpc-cni.image" -}} +{{- if .Values.image.override }} +{{- .Values.image.override }} +{{- else }} +{{- printf "%s.dkr.%s.%s.%s/amazon-k8s-cni:%s" .Values.image.account .Values.image.endpoint .Values.image.region .Values.image.domain .Values.image.tag }} +{{- end }} +{{- end }} diff --git a/stable/aws-vpc-cni/templates/clusterrole.yaml b/stable/aws-vpc-cni/templates/clusterrole.yaml index fb096ef0f..24b91556f 100644 --- a/stable/aws-vpc-cni/templates/clusterrole.yaml +++ b/stable/aws-vpc-cni/templates/clusterrole.yaml @@ -29,10 +29,6 @@ rules: resources: - nodes verbs: ["list", "watch", "get", "update"] - - apiGroups: ["extensions"] - resources: - - '*' - verbs: ["list", "watch"] - apiGroups: ["", "events.k8s.io"] resources: - events diff --git a/stable/aws-vpc-cni/templates/daemonset.yaml b/stable/aws-vpc-cni/templates/daemonset.yaml index 80f092b5e..a6877b1f8 100644 --- a/stable/aws-vpc-cni/templates/daemonset.yaml +++ b/stable/aws-vpc-cni/templates/daemonset.yaml @@ -40,7 +40,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "{{- if .Values.init.image.override }}{{- .Values.init.image.override }}{{- else }}{{- .Values.init.image.account }}.dkr.ecr.{{- .Values.init.image.region }}.{{- .Values.init.image.domain }}/amazon-k8s-cni-init:{{- .Values.init.image.tag }}{{- end}}" + image: {{ include "aws-vpc-cni.initImage" . }} env: {{- range $key, $value := .Values.init.env }} - name: {{ $key }} @@ -48,12 +48,16 @@ spec: {{- end }} securityContext: {{- toYaml .Values.init.securityContext | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - mountPath: /host/opt/cni/bin name: cni-bin-dir terminationGracePeriodSeconds: 10 + {{- with .Values.tolerations }} tolerations: - - operator: Exists + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} @@ -62,7 +66,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: aws-node - image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}{{- .Values.image.account }}.dkr.ecr.{{- .Values.image.region }}.{{- .Values.image.domain }}/amazon-k8s-cni:{{- .Values.image.tag }}{{- end}}" + image: {{ include "aws-vpc-cni.image" . }} ports: - containerPort: 61678 name: metrics @@ -80,10 +84,12 @@ spec: - name: MY_NODE_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: spec.nodeName - name: MY_POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name resources: {{- toYaml .Values.resources | nindent 12 }} @@ -144,7 +150,3 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml index 2584f4bf2..750803f2e 100644 --- a/stable/aws-vpc-cni/values.yaml +++ b/stable/aws-vpc-cni/values.yaml @@ -8,12 +8,14 @@ nameOverride: aws-node init: image: - tag: v1.12.6 + tag: v1.13.0 + domain: amazonaws.com region: us-west-2 + endpoint: ecr account: "602401143452" pullPolicy: Always - domain: "amazonaws.com" # Set to use custom image + override: # override: "repo/org/image:tag" env: DISABLE_TCP_EARLY_DEMUX: "false" @@ -22,12 +24,14 @@ init: privileged: true image: + tag: v1.13.0 + domain: amazonaws.com region: us-west-2 - tag: v1.12.6 + endpoint: ecr account: "602401143452" - domain: "amazonaws.com" pullPolicy: Always # Set to use custom image + override: # override: "repo/org/image:tag" # The CNI supports a number of environment variable settings @@ -122,7 +126,8 @@ updateStrategy: nodeSelector: {} -tolerations: [] +tolerations: + - operator: Exists affinity: nodeAffinity: diff --git a/stable/cni-metrics-helper/Chart.yaml b/stable/cni-metrics-helper/Chart.yaml index 85dbad660..cb5cf20b4 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: 0.1.18 -appVersion: v1.12.6 +version: 1.13.0 +appVersion: v1.13.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 fd203db57..898abf4b9 100644 --- a/stable/cni-metrics-helper/README.md +++ b/stable/cni-metrics-helper/README.md @@ -47,12 +47,14 @@ 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.6 | +| image.tag | Image tag | v1.13.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.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 | {} | diff --git a/stable/cni-metrics-helper/values.yaml b/stable/cni-metrics-helper/values.yaml index 4088f3f26..45239456d 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.12.6 + tag: v1.13.0 account: "602401143452" domain: "amazonaws.com" # Set to use custom image From 8a709f3f7def95ca9fa3f3d081093e8982b93b15 Mon Sep 17 00:00:00 2001 From: Yuanshun Dong <123429070+ysdongAmazon@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:59:08 -0700 Subject: [PATCH 09/17] appmesh-controller: v1.12.1 (#954) Co-authored-by: eks-bot --- stable/appmesh-controller/Chart.yaml | 4 ++-- stable/appmesh-controller/ci/values.yaml | 2 +- stable/appmesh-controller/templates/rbac.yaml | 7 +++++++ stable/appmesh-controller/test.yaml | 4 ++-- stable/appmesh-controller/values.yaml | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/stable/appmesh-controller/Chart.yaml b/stable/appmesh-controller/Chart.yaml index ab9ed0315..6269b4be5 100644 --- a/stable/appmesh-controller/Chart.yaml +++ b/stable/appmesh-controller/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: appmesh-controller description: App Mesh controller Helm chart for Kubernetes -version: 1.11.0 -appVersion: 1.11.0 +version: 1.12.1 +appVersion: 1.12.1 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/stable/appmesh-controller/ci/values.yaml b/stable/appmesh-controller/ci/values.yaml index c99fb2434..17cb9e0bb 100644 --- a/stable/appmesh-controller/ci/values.yaml +++ b/stable/appmesh-controller/ci/values.yaml @@ -5,5 +5,5 @@ accountId: 123456789 region: us-west-2 image: repository: public.ecr.aws/appmesh/appmesh-controller - tag: v1.11.0 + tag: v1.12.1 pullPolicy: IfNotPresent diff --git a/stable/appmesh-controller/templates/rbac.yaml b/stable/appmesh-controller/templates/rbac.yaml index 35acfa7f6..22ca9cf5a 100644 --- a/stable/appmesh-controller/templates/rbac.yaml +++ b/stable/appmesh-controller/templates/rbac.yaml @@ -17,6 +17,13 @@ rules: - apiGroups: [""] resources: [events] verbs: [create, patch] +- apiGroups: ["coordination.k8s.io"] + resources: [leases] + verbs: [create] +- apiGroups: ["coordination.k8s.io"] + resources: [leases] + resourceNames: [appmesh-controller-leader-election] + verbs: [get, update, patch] --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding diff --git a/stable/appmesh-controller/test.yaml b/stable/appmesh-controller/test.yaml index 222d251c2..74c398d33 100644 --- a/stable/appmesh-controller/test.yaml +++ b/stable/appmesh-controller/test.yaml @@ -12,13 +12,13 @@ useAwsFIPSEndpoint: false image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller - tag: v1.11.0 + tag: v1.12.1 pullPolicy: IfNotPresent sidecar: image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy - tag: v1.25.1.0-prod + tag: v1.25.4.0-prod # sidecar.logLevel: Envoy log level can be info, warn, error or debug logLevel: info envoyAdminAccessPort: 9901 diff --git a/stable/appmesh-controller/values.yaml b/stable/appmesh-controller/values.yaml index 2e225759e..938705cef 100644 --- a/stable/appmesh-controller/values.yaml +++ b/stable/appmesh-controller/values.yaml @@ -13,13 +13,13 @@ useAwsFIPSEndpoint: false image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller - tag: v1.11.0 + tag: v1.12.1 pullPolicy: IfNotPresent sidecar: image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy - tag: v1.25.1.0-prod + tag: v1.25.4.0-prod # sidecar.logLevel: Envoy log level can be info, warn, error or debug logLevel: info envoyAdminAccessPort: 9901 From 3924142176a5480a042fcc95e8e9b0ec8ef028e0 Mon Sep 17 00:00:00 2001 From: Julien Boulanger Date: Tue, 13 Jun 2023 21:03:33 +0200 Subject: [PATCH 10/17] fix(fluentbit): rewrite erroneous ident --- stable/aws-for-fluent-bit/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/templates/configmap.yaml b/stable/aws-for-fluent-bit/templates/configmap.yaml index 4f9eb5136..78e808bf9 100755 --- a/stable/aws-for-fluent-bit/templates/configmap.yaml +++ b/stable/aws-for-fluent-bit/templates/configmap.yaml @@ -480,7 +480,7 @@ data: Suppress_Type_Name {{ .Values.opensearch.suppressTypeName }} {{- end }} {{- if .Values.opensearch.extraOutputs }} -{{ .Values.opensearch.extraOutputsIndent_8 }} +{{ .Values.opensearch.extraOutputs | indent 8 }} {{- end }} {{- end }} From 9180a69d271cc0103b6b9db0d4df40534e0f6b0a Mon Sep 17 00:00:00 2001 From: Julien Boulanger Date: Wed, 14 Jun 2023 11:18:58 +0200 Subject: [PATCH 11/17] fix(fluentbit): rewrite erroneous ident --- stable/aws-for-fluent-bit/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/templates/configmap.yaml b/stable/aws-for-fluent-bit/templates/configmap.yaml index 78e808bf9..e2571b567 100755 --- a/stable/aws-for-fluent-bit/templates/configmap.yaml +++ b/stable/aws-for-fluent-bit/templates/configmap.yaml @@ -478,7 +478,7 @@ data: {{- end }} {{- if .Values.opensearch.suppressTypeName }} Suppress_Type_Name {{ .Values.opensearch.suppressTypeName }} - {{- end }} + {{- end -}} {{- if .Values.opensearch.extraOutputs }} {{ .Values.opensearch.extraOutputs | indent 8 }} {{- end }} From 377cb10ef999488c9c51a9126a557df53cbb6dc2 Mon Sep 17 00:00:00 2001 From: Shelby Hagman Date: Fri, 16 Jun 2023 10:15:21 -0700 Subject: [PATCH 12/17] Bumping aws-for-fluent-bit helm chart version - 2.28.4 --> stable (less manual updates) - version 0.1.25 --> 0.1.26 - update readme --- stable/aws-for-fluent-bit/Chart.yaml | 4 ++-- stable/aws-for-fluent-bit/README.md | 2 +- stable/aws-for-fluent-bit/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/aws-for-fluent-bit/Chart.yaml b/stable/aws-for-fluent-bit/Chart.yaml index c3211212c..40afbc722 100644 --- a/stable/aws-for-fluent-bit/Chart.yaml +++ b/stable/aws-for-fluent-bit/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: aws-for-fluent-bit description: A Helm chart to deploy aws-for-fluent-bit project -version: 0.1.25 -appVersion: 2.28.4 +version: 0.1.26 +appVersion: stable home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index ec34f2be6..b6c46aa2f 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -30,7 +30,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | - | - | - | - | `global.namespaceOverride` | Override the deployment namespace | Not set (`Release.Namespace`) | | `image.repository` | Image to deploy | `amazon/aws-for-fluent-bit` | ✔ -| `image.tag` | Image tag to deploy | `2.28.4` +| `image.tag` | Image tag to deploy | `stable` | | `image.pullPolicy` | Pull policy for the image | `IfNotPresent` | ✔ | `podSecurityContext` | Security Context for pod | `{}` | | `containerSecurityContext` | Security Context for container | `{}` | diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml index 59d34dfca..2ad20736f 100644 --- a/stable/aws-for-fluent-bit/values.yaml +++ b/stable/aws-for-fluent-bit/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/aws-observability/aws-for-fluent-bit - tag: 2.28.4 + tag: stable pullPolicy: IfNotPresent imagePullSecrets: [] From 27118eb982ac8e8fc72d2bca801f8056bf1f7ae3 Mon Sep 17 00:00:00 2001 From: Jeffrey Nelson Date: Sun, 18 Jun 2023 19:43:11 -0500 Subject: [PATCH 13/17] VPC CNI updates for v1.13.2 release (#962) --- stable/aws-vpc-cni/Chart.yaml | 4 ++-- stable/aws-vpc-cni/README.md | 4 ++-- 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 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stable/aws-vpc-cni/Chart.yaml b/stable/aws-vpc-cni/Chart.yaml index 95188cdc5..687b4c101 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.13.0 -appVersion: "v1.13.0" +version: 1.13.2 +appVersion: "v1.13.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 index 2ed38a5bb..29e5b39cf 100644 --- a/stable/aws-vpc-cni/README.md +++ b/stable/aws-vpc-cni/README.md @@ -41,7 +41,7 @@ The following table lists the configurable parameters for this chart and their d | `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`) | | `fullnameOverride` | Override the fullname of the chart | `aws-node` | -| `image.tag` | Image tag | `v1.13.0` | +| `image.tag` | Image tag | `v1.13.2` | | `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` | @@ -49,7 +49,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.13.0` | +| `init.image.tag` | Image tag | `v1.13.2` | | `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/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml index 750803f2e..560aaeae5 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.13.0 + tag: v1.13.2 domain: amazonaws.com region: us-west-2 endpoint: ecr @@ -24,7 +24,7 @@ init: privileged: true image: - tag: v1.13.0 + tag: v1.13.2 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 cb5cf20b4..e90ca1001 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.13.0 -appVersion: v1.13.0 +version: 1.13.2 +appVersion: v1.13.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 index 898abf4b9..6844957b9 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.13.0 | +| image.tag | Image tag | v1.13.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 | diff --git a/stable/cni-metrics-helper/values.yaml b/stable/cni-metrics-helper/values.yaml index 45239456d..a82025f44 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.13.0 + tag: v1.13.2 account: "602401143452" domain: "amazonaws.com" # Set to use custom image From ca97c94370d223b8d02390b385e149ca74b974e1 Mon Sep 17 00:00:00 2001 From: Olivia Song Date: Thu, 22 Jun 2023 17:48:26 -0700 Subject: [PATCH 14/17] aws-load-balancer-controller: v2.5.3 (#968) Co-authored-by: eks-bot --- stable/aws-load-balancer-controller/Chart.yaml | 4 ++-- stable/aws-load-balancer-controller/README.md | 2 ++ stable/aws-load-balancer-controller/templates/pdb.yaml | 4 ---- .../aws-load-balancer-controller/templates/webhook.yaml | 8 -------- stable/aws-load-balancer-controller/test.yaml | 2 +- stable/aws-load-balancer-controller/values.yaml | 2 +- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/stable/aws-load-balancer-controller/Chart.yaml b/stable/aws-load-balancer-controller/Chart.yaml index f7ab53be1..363fff854 100644 --- a/stable/aws-load-balancer-controller/Chart.yaml +++ b/stable/aws-load-balancer-controller/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: aws-load-balancer-controller description: AWS Load Balancer Controller Helm chart for Kubernetes -version: 1.5.3 -appVersion: v2.5.2 +version: 1.5.4 +appVersion: v2.5.3 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/stable/aws-load-balancer-controller/README.md b/stable/aws-load-balancer-controller/README.md index 95e3154a5..ee4be9aad 100644 --- a/stable/aws-load-balancer-controller/README.md +++ b/stable/aws-load-balancer-controller/README.md @@ -82,6 +82,8 @@ kubectl apply -k "github.com/aws/eks-charts/stable/aws-load-balancer-controller/ If you are setting `enableCertManager: true` you need to have installed cert-manager and it's CRDs before installing this chart; to install [cert-manager](https://artifacthub.io/packages/helm/cert-manager/cert-manager) follow the installation guide. +The controller helm chart requires the cert-manager with apiVersion `cert-manager.io/v1`. + Set `cluster.dnsDomain` (default: `cluster.local`) to the actual DNS domain of your cluster to include the FQDN in requested TLS certificates. #### Installing the Prometheus Operator diff --git a/stable/aws-load-balancer-controller/templates/pdb.yaml b/stable/aws-load-balancer-controller/templates/pdb.yaml index 775adc4c1..f72abaf34 100644 --- a/stable/aws-load-balancer-controller/templates/pdb.yaml +++ b/stable/aws-load-balancer-controller/templates/pdb.yaml @@ -1,9 +1,5 @@ {{- if and .Values.podDisruptionBudget (gt (int .Values.replicaCount) 1) }} -{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }} apiVersion: policy/v1 -{{- else }} -apiVersion: policy/v1beta1 -{{- end }} kind: PodDisruptionBudget metadata: name: {{ include "aws-load-balancer-controller.fullname" . }} diff --git a/stable/aws-load-balancer-controller/templates/webhook.yaml b/stable/aws-load-balancer-controller/templates/webhook.yaml index ec01d7c58..e7d557e41 100644 --- a/stable/aws-load-balancer-controller/templates/webhook.yaml +++ b/stable/aws-load-balancer-controller/templates/webhook.yaml @@ -212,11 +212,7 @@ data: tls.crt: {{ $tls.clientCert }} tls.key: {{ $tls.clientKey }} {{- else }} -{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }} apiVersion: cert-manager.io/v1 -{{- else }} -apiVersion: cert-manager.io/v1alpha2 -{{- end }} kind: Certificate metadata: name: {{ template "aws-load-balancer-controller.namePrefix" . }}-serving-cert @@ -232,11 +228,7 @@ spec: name: {{ template "aws-load-balancer-controller.namePrefix" . }}-selfsigned-issuer secretName: {{ template "aws-load-balancer-controller.webhookCertSecret" . }} --- -{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }} apiVersion: cert-manager.io/v1 -{{- else }} -apiVersion: cert-manager.io/v1alpha2 -{{- end }} kind: Issuer metadata: name: {{ template "aws-load-balancer-controller.namePrefix" . }}-selfsigned-issuer diff --git a/stable/aws-load-balancer-controller/test.yaml b/stable/aws-load-balancer-controller/test.yaml index 54480f826..3c4a90754 100644 --- a/stable/aws-load-balancer-controller/test.yaml +++ b/stable/aws-load-balancer-controller/test.yaml @@ -6,7 +6,7 @@ replicaCount: 2 image: repository: public.ecr.aws/eks/aws-load-balancer-controller - tag: v2.5.2 + tag: v2.5.3 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/stable/aws-load-balancer-controller/values.yaml b/stable/aws-load-balancer-controller/values.yaml index 874e565d7..dea199559 100644 --- a/stable/aws-load-balancer-controller/values.yaml +++ b/stable/aws-load-balancer-controller/values.yaml @@ -6,7 +6,7 @@ replicaCount: 2 image: repository: public.ecr.aws/eks/aws-load-balancer-controller - tag: v2.5.2 + tag: v2.5.3 pullPolicy: IfNotPresent imagePullSecrets: [] From ff9ab6e95ae05b087ae6ffa72aaf10635649a7da Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Thu, 22 Jun 2023 16:31:53 -0700 Subject: [PATCH 15/17] aws-for-fluent-bit: switch to hardcode stable version to address user complaints https://github.com/aws/aws-for-fluent-bit/issues/694 Signed-off-by: Wesley Pettit --- stable/aws-for-fluent-bit/Chart.yaml | 4 ++-- stable/aws-for-fluent-bit/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/aws-for-fluent-bit/Chart.yaml b/stable/aws-for-fluent-bit/Chart.yaml index 40afbc722..bef2e40a4 100644 --- a/stable/aws-for-fluent-bit/Chart.yaml +++ b/stable/aws-for-fluent-bit/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: aws-for-fluent-bit description: A Helm chart to deploy aws-for-fluent-bit project -version: 0.1.26 -appVersion: stable +version: 0.1.27 +appVersion: 2.31.11 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml index 2ad20736f..4a604becc 100644 --- a/stable/aws-for-fluent-bit/values.yaml +++ b/stable/aws-for-fluent-bit/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/aws-observability/aws-for-fluent-bit - tag: stable + tag: 2.31.11 pullPolicy: IfNotPresent imagePullSecrets: [] From 49fd3094d3d9a42c4b6f7a09d76816ebfccdc848 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Wed, 12 Jul 2023 20:26:28 +0900 Subject: [PATCH 16/17] fix document --- stable/aws-for-fluent-bit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index b6c46aa2f..fe1475207 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -96,7 +96,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `kinesis_streams.stream` | The name of the Kinesis Streams Delivery Stream that you want log records send to. | ✔ | `kinesis_streams.endpoint` | Specify a custom endpoint for the Kinesis Streams API. | | | `kinesis_streams.role_arn` | ARN of an IAM role to assume (for cross account access). | | -| `kinesis_streams.sts_endpoint` | Custom endpoint for the STS API. `kinesis_streams.sts_endpoint`. | | +| `kinesis_streams.sts_endpoint` | Custom endpoint for the STS API. | | | `kinesis_streams.time_key` | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | | | `kinesis_streams.time_key_format` | strftime compliant format string for the timestamp; for example, the default is `%Y-%m-%dT%H:%M:%S`. Supports millisecond precision with `%3N` and supports nanosecond precision with `%9N` and `%L`; for example, adding `%3N` to support millisecond `%Y-%m-%dT%H:%M:%S.%3N`. This option is used with `time_key`. | | | `kinesis_streams.log_key` | By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify `log_key log` and only the log message will be sent to Kinesis. | | From 365cc1b9549ae10173c32c44a81d9cbc8b46f971 Mon Sep 17 00:00:00 2001 From: "june.i" Date: Wed, 12 Jul 2023 20:28:57 +0900 Subject: [PATCH 17/17] fix chart version --- stable/aws-for-fluent-bit/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/aws-for-fluent-bit/Chart.yaml b/stable/aws-for-fluent-bit/Chart.yaml index bef2e40a4..f5e3e8c4c 100644 --- a/stable/aws-for-fluent-bit/Chart.yaml +++ b/stable/aws-for-fluent-bit/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-for-fluent-bit description: A Helm chart to deploy aws-for-fluent-bit project -version: 0.1.27 +version: 0.1.28 appVersion: 2.31.11 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png