Bump version to 2.21.0

Signed-off-by: Wesley Pettit <[email protected]>

AWS_FOR_FLUENT_BIT_VERSION

@@ -1 +1 @@
-2.20.0
+2.21.0

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+### 2.21.0
+This release includes:
+* An Amazon Linux 2 Base
+* Fluent Bit [1.8.8](https://fluentbit.io/announcements/v1.8.8/)
+* Amazon CloudWatch Logs for Fluent Bit 1.6.3
+* Amazon Kinesis Streams for Fluent Bit 1.8.0
+* Amazon Kinesis Firehose for Fluent Bit 1.6.1
+
+Compared to `2.20.0` this release adds:
+* Feature/Warning - This release introduces IMDSv2 support. Instances that rely on IMDS for security credentials must set EC2's instance-metadata-option `http-put-response-hop-limit` to `2` otherwise Fluent Bit will hang [aws-for-fluent-bit:259](https://github.com/aws/aws-for-fluent-bit/pull/259)
+* Bug - Fix memory leak in S3 output [fluentbit:4038](https://github.com/fluent/fluent-bit/issues/4038)
+* Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098)
+* Bug - Downgrade `mbedtls` to 2.24.0 to fix the performance regression issue in `mbedtls` 2.26.0 [fluentbit:4110](https://github.com/fluent/fluent-bit/issues/4110)
+
 ### 2.20.0
 This release includes:
 * An Amazon Linux 2 Base

Dockerfile

@@ -1,7 +1,7 @@
 FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
 
 # Fluent Bit version; update these for each release
-ENV FLB_VERSION 1.8.7
+ENV FLB_VERSION 1.8.8
 # branch to pull parsers from in github.com/fluent/fluent-bit-docker-image
 ENV FLB_DOCKER_BRANCH 1.8
 
@@ -41,9 +41,9 @@ ENV PATH ${PATH}:/home/.gimme/versions/go1.17.linux.arm64/bin:/home/.gimme/versi
 RUN go version
 
 WORKDIR /tmp/fluent-bit-$FLB_VERSION/
-RUN git clone https://github.com/zhonghui12/fluent-bit.git /tmp/fluent-bit-$FLB_VERSION/
+RUN git clone https://github.com/PettitWesley/fluent-bit.git /tmp/fluent-bit-$FLB_VERSION/
 WORKDIR /tmp/fluent-bit-$FLB_VERSION/build/
-RUN git fetch origin && git checkout custom-1.8.7 && git status
+RUN git fetch origin && git checkout 1_8_8_patch && git status
 RUN cmake -DFLB_RELEASE=On \
           -DFLB_TRACE=Off \
           -DFLB_JEMALLOC=On \