From 9cfeefedd01e843605b5cd95a354e9256f4cf2a5 Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 13 Oct 2023 15:44:36 +1300
Subject: [PATCH 01/34] docs: Helm Chart construct code generation with CDK8s

---
 config/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/README.md b/config/README.md
index 41a451c40..155e1c690 100644
--- a/config/README.md
+++ b/config/README.md
@@ -42,6 +42,19 @@ However, some of the component Helm charts do not have a `values.schema.json`. F
 - aws-for-fluent-bit (<https://github.com/aws/eks-charts/issues/1011>)
 - Karpenter
 
+### Working with Helm charts
+
+#### Generate code
+
+It is possible to generate a specific Helm construct for the component if their chart includes a `value.schema.json`. This is useful to provide typing hints when specifying their configuration (<https://github.com/cdk8s-team/cdk8s/blob/master/docs/cli/import.md#values-schema>)
+
+To generate the Helm Construct for a specific Chart, follow the instructions [here](https://github.com/cdk8s-team/cdk8s/blob/master/docs/cli/import.md#values-schema)
+
+However, some of the component Helm charts do not have a `values.schema.json`. For those we won't generate any code and use the default `Helm` construct:
+
+- aws-for-fluent-bit
+
+
 ## Usage (for test)
 
 Ensure all dependencies are installed

From f67eb9c5331a17bcde8081742b4c12d26424de3a Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 13 Oct 2023 15:45:32 +1300
Subject: [PATCH 02/34] docs: link to fluent-bit gh issue

---
 config/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/README.md b/config/README.md
index 155e1c690..93df4ab8e 100644
--- a/config/README.md
+++ b/config/README.md
@@ -52,7 +52,7 @@ To generate the Helm Construct for a specific Chart, follow the instructions [he
 
 However, some of the component Helm charts do not have a `values.schema.json`. For those we won't generate any code and use the default `Helm` construct:
 
-- aws-for-fluent-bit
+- aws-for-fluent-bit (<https://github.com/aws/eks-charts/issues/1011>)
 
 
 ## Usage (for test)

From 6c596c35026e804f3c360bbc425deb5fb82ec9de Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Fri, 13 Oct 2023 16:09:08 +1300
Subject: [PATCH 03/34] WIP: fluentbit

TODO: update name
---
 config/app.ts              | 15 +++++++++++++++
 config/charts/fluentbit.ts | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 config/app.ts
 create mode 100644 config/charts/fluentbit.ts

diff --git a/config/app.ts b/config/app.ts
new file mode 100644
index 000000000..02c7bdfb4
--- /dev/null
+++ b/config/app.ts
@@ -0,0 +1,15 @@
+import { App } from 'cdk8s';
+
+import { ArgoSemaphore } from './charts/argo.semaphores';
+import { FluentBit } from './charts/fluentbit';
+
+const app = new App();
+
+async function main(): Promise<void> {
+  new ArgoSemaphore(app, 'semaphore', {});
+  new FluentBit(app, 'fluentbit', {});
+
+  app.synth();
+}
+
+main();
diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
new file mode 100644
index 000000000..f0d6bf745
--- /dev/null
+++ b/config/charts/fluentbit.ts
@@ -0,0 +1,37 @@
+import { Chart, ChartProps, Helm } from 'cdk8s';
+import { Construct } from 'constructs';
+
+import { applyDefaultLabels } from '../util/labels.js';
+
+export class FluentBit extends Chart {
+  constructor(scope: Construct, id: string, props: ChartProps) {
+    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
+
+    const FluentParserName = 'containerd';
+    // This needs to be properly formatted, and it was stolen directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
+    // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
+    const FluentContainerParser = `[PARSER]
+        Name ${FluentParserName}
+        Format regex
+        Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
+        Time_Key    time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L%z
+    `;
+
+    new Helm(this, 'aws-for-fluent-bit', {
+      chart: 'aws-for-fluent-bit',
+      repo: 'https://aws.github.io/eks-charts',
+      namespace: 'kube-system',
+      version: '0.1.30',
+      values: {
+        input: { parser: FluentParserName, dockerMode: 'Off' },
+        serviceAccount: { name: 'aws-for-fluent-bit-sa', create: false },
+        cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },
+        firehose: { enabled: false },
+        kinesis: { enabled: false },
+        elasticsearch: { enabled: false },
+        service: { extraParsers: FluentContainerParser },
+      },
+    });
+  }
+}

From 71f59ee7e191382deb97c10963af41ef9d359e56 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Mon, 16 Oct 2023 11:21:32 +1300
Subject: [PATCH 04/34] fix: wording of comment

---
 config/charts/fluentbit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index f0d6bf745..3ad60be92 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -8,7 +8,7 @@ export class FluentBit extends Chart {
     super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
-    // This needs to be properly formatted, and it was stolen directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
+    // This needs to be properly formatted, and it was taken directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
     // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
     const FluentContainerParser = `[PARSER]
         Name ${FluentParserName}

From 3c33a1108d46760a5a0cbfc894d94acec244ed59 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 10:45:13 +1300
Subject: [PATCH 05/34] fix: rebase error - delete app.ts

---
 config/app.ts   | 15 ---------------
 config/cdk8s.ts |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 config/app.ts

diff --git a/config/app.ts b/config/app.ts
deleted file mode 100644
index 02c7bdfb4..000000000
--- a/config/app.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { App } from 'cdk8s';
-
-import { ArgoSemaphore } from './charts/argo.semaphores';
-import { FluentBit } from './charts/fluentbit';
-
-const app = new App();
-
-async function main(): Promise<void> {
-  new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', {});
-
-  app.synth();
-}
-
-main();
diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index 395051ae2..b5173734f 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -1,10 +1,10 @@
 import { App } from 'cdk8s';
 
 import { ArgoSemaphore } from './charts/argo.semaphores';
+import { FluentBit } from './charts/fluentbit';
 import { Karpenter, KarpenterProvisioner } from './charts/karpenter';
 import { CoreDns } from './charts/kube-system.coredns';
-import { CfnOutputKeys } from './constants';
-import { CLUSTER_NAME } from './constants';
+import { CLUSTER_NAME, CfnOutputKeys } from './constants';
 import { getCfnOutputs } from './util/cloud.formation';
 
 const app = new App();
@@ -18,6 +18,7 @@ async function main(): Promise<void> {
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
+  new FluentBit(app, 'fluentbit', {});
   new CoreDns(app, 'Dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {

From 42180747ade6c68e62b3b2a4c705701e806536d0 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 10:51:20 +1300
Subject: [PATCH 06/34] fix: formatting

---
 config/cdk8s.ts     | 8 ++++----
 config/constants.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index b5173734f..b8433b936 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -4,14 +4,14 @@ import { ArgoSemaphore } from './charts/argo.semaphores';
 import { FluentBit } from './charts/fluentbit';
 import { Karpenter, KarpenterProvisioner } from './charts/karpenter';
 import { CoreDns } from './charts/kube-system.coredns';
-import { CLUSTER_NAME, CfnOutputKeys } from './constants';
+import { CfnOutputKeys, ClusterName } from './constants';
 import { getCfnOutputs } from './util/cloud.formation';
 
 const app = new App();
 
 async function main(): Promise<void> {
   // Get cloudformation outputs
-  const cfnOutputs = await getCfnOutputs(CLUSTER_NAME);
+  const cfnOutputs = await getCfnOutputs(ClusterName);
   const missingKeys = [...Object.values(CfnOutputKeys.Karpenter)].filter((f) => cfnOutputs[f] == null);
   if (missingKeys.length > 0) {
     throw new Error(`Missing CloudFormation Outputs for keys ${missingKeys.join(', ')}`);
@@ -22,7 +22,7 @@ async function main(): Promise<void> {
   new CoreDns(app, 'Dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {
-    clusterName: CLUSTER_NAME,
+    clusterName: ClusterName,
     clusterEndpoint: cfnOutputs[CfnOutputKeys.Karpenter.ClusterEndpoint],
     saRoleName: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountName],
     saRoleArn: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountRoleArn],
@@ -30,7 +30,7 @@ async function main(): Promise<void> {
   });
 
   const karpenterProvisioner = new KarpenterProvisioner(app, 'karpenter-provisioner', {
-    clusterName: CLUSTER_NAME,
+    clusterName: ClusterName,
     clusterEndpoint: cfnOutputs[CfnOutputKeys.Karpenter.ClusterEndpoint],
     saRoleName: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountName],
     saRoleArn: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountRoleArn],
diff --git a/config/constants.ts b/config/constants.ts
index b5a57f15a..1d2c252eb 100644
--- a/config/constants.ts
+++ b/config/constants.ts
@@ -1,5 +1,5 @@
 /* Cluster name */
-export const CLUSTER_NAME = 'Workflows';
+export const ClusterName = 'Workflows';
 
 /* CloudFormation Output to access from CDK8s */
 export const CfnOutputKeys = {

From 6821459e78900b830eab36be49293dc3767b122f Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 11:14:14 +1300
Subject: [PATCH 07/34] feat: service account name

---
 config/cdk8s.ts            |  8 +++++---
 config/charts/fluentbit.ts |  8 ++++++--
 config/constants.ts        |  3 +++
 config/eks/cluster.ts      |  8 ++++----
 package-lock.json          | 18 ++++++++++++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index b8433b936..be77258a8 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -12,14 +12,16 @@ const app = new App();
 async function main(): Promise<void> {
   // Get cloudformation outputs
   const cfnOutputs = await getCfnOutputs(ClusterName);
-  const missingKeys = [...Object.values(CfnOutputKeys.Karpenter)].filter((f) => cfnOutputs[f] == null);
+  const missingKeys = [...Object.values(CfnOutputKeys.Karpenter), ...Object.values(CfnOutputKeys.FluentBit)].filter(
+    (f) => cfnOutputs[f] == null,
+  );
   if (missingKeys.length > 0) {
     throw new Error(`Missing CloudFormation Outputs for keys ${missingKeys.join(', ')}`);
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', {});
-  new CoreDns(app, 'Dns', {});
+  new FluentBit(app, 'fluentbit', { saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName] });
+  new CoreDns(app, 'dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {
     clusterName: ClusterName,
diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 3ad60be92..769a2b1b0 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -3,8 +3,12 @@ import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';
 
+export interface FluentBitProps {
+  saRoleName: string;
+}
+
 export class FluentBit extends Chart {
-  constructor(scope: Construct, id: string, props: ChartProps) {
+  constructor(scope: Construct, id: string, props: FluentBitProps & ChartProps) {
     super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
@@ -25,7 +29,7 @@ export class FluentBit extends Chart {
       version: '0.1.30',
       values: {
         input: { parser: FluentParserName, dockerMode: 'Off' },
-        serviceAccount: { name: 'aws-for-fluent-bit-sa', create: false },
+        serviceAccount: { name: props.saRoleName, create: false },
         cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },
         firehose: { enabled: false },
         kinesis: { enabled: false },
diff --git a/config/constants.ts b/config/constants.ts
index 1d2c252eb..effc3ec9b 100644
--- a/config/constants.ts
+++ b/config/constants.ts
@@ -9,4 +9,7 @@ export const CfnOutputKeys = {
     ClusterEndpoint: 'ClusterEndpoint',
     DefaultInstanceProfile: 'DefaultInstanceProfile',
   },
+  FluentBit: {
+    ServiceAccountName: 'FluentBitServiceAccountName',
+  },
 };
diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index 9adfcf960..3e68c2b07 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -1,6 +1,6 @@
 import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27';
 import { Aws, CfnOutput, Duration, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
-import { InstanceType, IVpc, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
+import { IVpc, InstanceType, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
 import { Cluster, ClusterLoggingTypes, IpFamily, KubernetesVersion, NodegroupAmiType } from 'aws-cdk-lib/aws-eks';
 import {
   CfnInstanceProfile,
@@ -11,8 +11,7 @@ import {
   Role,
   ServicePrincipal,
 } from 'aws-cdk-lib/aws-iam';
-import { IBucket } from 'aws-cdk-lib/aws-s3';
-import { BlockPublicAccess, Bucket } from 'aws-cdk-lib/aws-s3';
+import { BlockPublicAccess, Bucket, IBucket } from 'aws-cdk-lib/aws-s3';
 import { Construct } from 'constructs';
 
 import { CfnOutputKeys } from '../constants';
@@ -199,7 +198,8 @@ export class LinzEksCluster extends Stack {
       namespace: 'fluent-bit',
     });
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
-    new CfnOutput(this, 'FluentBitServiceAccountRoleArn', { value: fluentBitSa.role.roleArn });
+
+    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.name });
 
     // Basic constructs for argo to be deployed into
     const argoNs = this.cluster.addManifest('ArgoNameSpace', {
diff --git a/package-lock.json b/package-lock.json
index 4714a41d3..4fea19ccc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2958,18 +2958,24 @@
     },
     "node_modules/cdk8s-plus-25/node_modules/balanced-match": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-25/node_modules/concat-map": {
       "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-25/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -3014,18 +3020,24 @@
     },
     "node_modules/cdk8s-plus-27/node_modules/balanced-match": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-27/node_modules/concat-map": {
       "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-27/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -3048,12 +3060,16 @@
     },
     "node_modules/cdk8s/node_modules/fast-json-patch": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s/node_modules/follow-redirects": {
       "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "dev": true,
       "funding": [
         {
@@ -3074,6 +3090,8 @@
     },
     "node_modules/cdk8s/node_modules/yaml": {
       "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",

From 58ade184e52b781028d7a2e3c0422b647fa350a6 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:21:05 +1300
Subject: [PATCH 08/34] fix: clustername refactor not saved

---
 config/cdk.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/cdk.ts b/config/cdk.ts
index 27fc83b3c..fa9382746 100644
--- a/config/cdk.ts
+++ b/config/cdk.ts
@@ -1,12 +1,12 @@
 import { App } from 'aws-cdk-lib';
 
-import { CLUSTER_NAME } from './constants';
+import { ClusterName } from './constants';
 import { LinzEksCluster } from './eks/cluster';
 
 const app = new App();
 
 async function main(): Promise<void> {
-  new LinzEksCluster(app, CLUSTER_NAME, {
+  new LinzEksCluster(app, ClusterName, {
     env: { region: 'ap-southeast-2', account: process.env.CDK_DEFAULT_ACCOUNT },
   });
 

From b4330ebc870a590af960f87367227e43b6e4ffd2 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:21:24 +1300
Subject: [PATCH 09/34] fix: typo and wrong namespace

---
 config/charts/fluentbit.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 769a2b1b0..8334d1f83 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -25,9 +25,10 @@ export class FluentBit extends Chart {
     new Helm(this, 'aws-for-fluent-bit', {
       chart: 'aws-for-fluent-bit',
       repo: 'https://aws.github.io/eks-charts',
-      namespace: 'kube-system',
+      namespace: 'fluent-bit',
       version: '0.1.30',
       values: {
+        fullnameOverride: 'fluentbit',
         input: { parser: FluentParserName, dockerMode: 'Off' },
         serviceAccount: { name: props.saRoleName, create: false },
         cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },

From 4429106b4890d9f1b7c816063bc844ecdf9507f7 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:22:14 +1300
Subject: [PATCH 10/34] chore: noting fullnameOverride not working?

---
 config/charts/karpenter.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/charts/karpenter.ts b/config/charts/karpenter.ts
index 3b6f41f83..64d3f565f 100644
--- a/config/charts/karpenter.ts
+++ b/config/charts/karpenter.ts
@@ -44,6 +44,7 @@ export class Karpenter extends Chart {
       namespace: 'karpenter',
       version: 'v0.31.0',
       values: {
+        // FIXME: fullnameOverride: 'karpenter',
         serviceAccount: {
           create: false,
           name: props.saRoleName,

From bb5e7404e52ef2b5b8a4358677ef65db66ce8100 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:22:29 +1300
Subject: [PATCH 11/34] fix: incorrect name

---
 config/eks/cluster.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index 3e68c2b07..d5bf5ae62 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -199,7 +199,7 @@ export class LinzEksCluster extends Stack {
     });
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
 
-    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.name });
+    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.serviceAccountName });
 
     // Basic constructs for argo to be deployed into
     const argoNs = this.cluster.addManifest('ArgoNameSpace', {

From 9d98c35bd6e00da62c0ae7e78ff93c910424b6b8 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:24:05 +1300
Subject: [PATCH 12/34] fix: format imports

---
 config/eks/cluster.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index d5bf5ae62..c4725feec 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -1,6 +1,6 @@
 import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27';
 import { Aws, CfnOutput, Duration, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
-import { IVpc, InstanceType, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
+import { InstanceType, IVpc, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
 import { Cluster, ClusterLoggingTypes, IpFamily, KubernetesVersion, NodegroupAmiType } from 'aws-cdk-lib/aws-eks';
 import {
   CfnInstanceProfile,

From 8c8f0a432a8bc2f28dfec8acaeaaad75e78f106f Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 13 Oct 2023 15:44:36 +1300
Subject: [PATCH 13/34] docs: Helm Chart construct code generation with CDK8s

---
 config/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/README.md b/config/README.md
index 41a451c40..155e1c690 100644
--- a/config/README.md
+++ b/config/README.md
@@ -42,6 +42,19 @@ However, some of the component Helm charts do not have a `values.schema.json`. F
 - aws-for-fluent-bit (<https://github.com/aws/eks-charts/issues/1011>)
 - Karpenter
 
+### Working with Helm charts
+
+#### Generate code
+
+It is possible to generate a specific Helm construct for the component if their chart includes a `value.schema.json`. This is useful to provide typing hints when specifying their configuration (<https://github.com/cdk8s-team/cdk8s/blob/master/docs/cli/import.md#values-schema>)
+
+To generate the Helm Construct for a specific Chart, follow the instructions [here](https://github.com/cdk8s-team/cdk8s/blob/master/docs/cli/import.md#values-schema)
+
+However, some of the component Helm charts do not have a `values.schema.json`. For those we won't generate any code and use the default `Helm` construct:
+
+- aws-for-fluent-bit
+
+
 ## Usage (for test)
 
 Ensure all dependencies are installed

From 852298da91ae04ec55c1cf80cf4647ec65b5e1a4 Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 13 Oct 2023 15:45:32 +1300
Subject: [PATCH 14/34] docs: link to fluent-bit gh issue

---
 config/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/README.md b/config/README.md
index 155e1c690..93df4ab8e 100644
--- a/config/README.md
+++ b/config/README.md
@@ -52,7 +52,7 @@ To generate the Helm Construct for a specific Chart, follow the instructions [he
 
 However, some of the component Helm charts do not have a `values.schema.json`. For those we won't generate any code and use the default `Helm` construct:
 
-- aws-for-fluent-bit
+- aws-for-fluent-bit (<https://github.com/aws/eks-charts/issues/1011>)
 
 
 ## Usage (for test)

From 82e4adf7694c64424db303b8cccf86930da624cc Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Fri, 13 Oct 2023 16:09:08 +1300
Subject: [PATCH 15/34] WIP: fluentbit

TODO: update name
---
 config/app.ts              | 15 +++++++++++++++
 config/charts/fluentbit.ts | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 config/app.ts
 create mode 100644 config/charts/fluentbit.ts

diff --git a/config/app.ts b/config/app.ts
new file mode 100644
index 000000000..02c7bdfb4
--- /dev/null
+++ b/config/app.ts
@@ -0,0 +1,15 @@
+import { App } from 'cdk8s';
+
+import { ArgoSemaphore } from './charts/argo.semaphores';
+import { FluentBit } from './charts/fluentbit';
+
+const app = new App();
+
+async function main(): Promise<void> {
+  new ArgoSemaphore(app, 'semaphore', {});
+  new FluentBit(app, 'fluentbit', {});
+
+  app.synth();
+}
+
+main();
diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
new file mode 100644
index 000000000..f0d6bf745
--- /dev/null
+++ b/config/charts/fluentbit.ts
@@ -0,0 +1,37 @@
+import { Chart, ChartProps, Helm } from 'cdk8s';
+import { Construct } from 'constructs';
+
+import { applyDefaultLabels } from '../util/labels.js';
+
+export class FluentBit extends Chart {
+  constructor(scope: Construct, id: string, props: ChartProps) {
+    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
+
+    const FluentParserName = 'containerd';
+    // This needs to be properly formatted, and it was stolen directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
+    // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
+    const FluentContainerParser = `[PARSER]
+        Name ${FluentParserName}
+        Format regex
+        Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
+        Time_Key    time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L%z
+    `;
+
+    new Helm(this, 'aws-for-fluent-bit', {
+      chart: 'aws-for-fluent-bit',
+      repo: 'https://aws.github.io/eks-charts',
+      namespace: 'kube-system',
+      version: '0.1.30',
+      values: {
+        input: { parser: FluentParserName, dockerMode: 'Off' },
+        serviceAccount: { name: 'aws-for-fluent-bit-sa', create: false },
+        cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },
+        firehose: { enabled: false },
+        kinesis: { enabled: false },
+        elasticsearch: { enabled: false },
+        service: { extraParsers: FluentContainerParser },
+      },
+    });
+  }
+}

From 6a4098319481f5683acbd2cb664f5d85c55bf5c8 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Mon, 16 Oct 2023 11:21:32 +1300
Subject: [PATCH 16/34] fix: wording of comment

---
 config/charts/fluentbit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index f0d6bf745..3ad60be92 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -8,7 +8,7 @@ export class FluentBit extends Chart {
     super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
-    // This needs to be properly formatted, and it was stolen directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
+    // This needs to be properly formatted, and it was taken directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
     // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
     const FluentContainerParser = `[PARSER]
         Name ${FluentParserName}

From 8734e8a338def427449b8f1f841a4b222a4432b7 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 10:45:13 +1300
Subject: [PATCH 17/34] fix: rebase error - delete app.ts

---
 config/app.ts   | 15 ---------------
 config/cdk8s.ts |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 config/app.ts

diff --git a/config/app.ts b/config/app.ts
deleted file mode 100644
index 02c7bdfb4..000000000
--- a/config/app.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { App } from 'cdk8s';
-
-import { ArgoSemaphore } from './charts/argo.semaphores';
-import { FluentBit } from './charts/fluentbit';
-
-const app = new App();
-
-async function main(): Promise<void> {
-  new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', {});
-
-  app.synth();
-}
-
-main();
diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index 395051ae2..b5173734f 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -1,10 +1,10 @@
 import { App } from 'cdk8s';
 
 import { ArgoSemaphore } from './charts/argo.semaphores';
+import { FluentBit } from './charts/fluentbit';
 import { Karpenter, KarpenterProvisioner } from './charts/karpenter';
 import { CoreDns } from './charts/kube-system.coredns';
-import { CfnOutputKeys } from './constants';
-import { CLUSTER_NAME } from './constants';
+import { CLUSTER_NAME, CfnOutputKeys } from './constants';
 import { getCfnOutputs } from './util/cloud.formation';
 
 const app = new App();
@@ -18,6 +18,7 @@ async function main(): Promise<void> {
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
+  new FluentBit(app, 'fluentbit', {});
   new CoreDns(app, 'Dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {

From 05a01a17659c9623a5afc63af8474bca592e5461 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 10:51:20 +1300
Subject: [PATCH 18/34] fix: formatting

---
 config/cdk8s.ts     | 8 ++++----
 config/constants.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index b5173734f..b8433b936 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -4,14 +4,14 @@ import { ArgoSemaphore } from './charts/argo.semaphores';
 import { FluentBit } from './charts/fluentbit';
 import { Karpenter, KarpenterProvisioner } from './charts/karpenter';
 import { CoreDns } from './charts/kube-system.coredns';
-import { CLUSTER_NAME, CfnOutputKeys } from './constants';
+import { CfnOutputKeys, ClusterName } from './constants';
 import { getCfnOutputs } from './util/cloud.formation';
 
 const app = new App();
 
 async function main(): Promise<void> {
   // Get cloudformation outputs
-  const cfnOutputs = await getCfnOutputs(CLUSTER_NAME);
+  const cfnOutputs = await getCfnOutputs(ClusterName);
   const missingKeys = [...Object.values(CfnOutputKeys.Karpenter)].filter((f) => cfnOutputs[f] == null);
   if (missingKeys.length > 0) {
     throw new Error(`Missing CloudFormation Outputs for keys ${missingKeys.join(', ')}`);
@@ -22,7 +22,7 @@ async function main(): Promise<void> {
   new CoreDns(app, 'Dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {
-    clusterName: CLUSTER_NAME,
+    clusterName: ClusterName,
     clusterEndpoint: cfnOutputs[CfnOutputKeys.Karpenter.ClusterEndpoint],
     saRoleName: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountName],
     saRoleArn: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountRoleArn],
@@ -30,7 +30,7 @@ async function main(): Promise<void> {
   });
 
   const karpenterProvisioner = new KarpenterProvisioner(app, 'karpenter-provisioner', {
-    clusterName: CLUSTER_NAME,
+    clusterName: ClusterName,
     clusterEndpoint: cfnOutputs[CfnOutputKeys.Karpenter.ClusterEndpoint],
     saRoleName: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountName],
     saRoleArn: cfnOutputs[CfnOutputKeys.Karpenter.ServiceAccountRoleArn],
diff --git a/config/constants.ts b/config/constants.ts
index b5a57f15a..1d2c252eb 100644
--- a/config/constants.ts
+++ b/config/constants.ts
@@ -1,5 +1,5 @@
 /* Cluster name */
-export const CLUSTER_NAME = 'Workflows';
+export const ClusterName = 'Workflows';
 
 /* CloudFormation Output to access from CDK8s */
 export const CfnOutputKeys = {

From e66f0c29f2add08140f26e954added5fd527fd7f Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 11:14:14 +1300
Subject: [PATCH 19/34] feat: service account name

---
 config/cdk8s.ts            |  8 +++++---
 config/charts/fluentbit.ts |  8 ++++++--
 config/constants.ts        |  3 +++
 config/eks/cluster.ts      |  8 ++++----
 package-lock.json          | 18 ++++++++++++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index b8433b936..be77258a8 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -12,14 +12,16 @@ const app = new App();
 async function main(): Promise<void> {
   // Get cloudformation outputs
   const cfnOutputs = await getCfnOutputs(ClusterName);
-  const missingKeys = [...Object.values(CfnOutputKeys.Karpenter)].filter((f) => cfnOutputs[f] == null);
+  const missingKeys = [...Object.values(CfnOutputKeys.Karpenter), ...Object.values(CfnOutputKeys.FluentBit)].filter(
+    (f) => cfnOutputs[f] == null,
+  );
   if (missingKeys.length > 0) {
     throw new Error(`Missing CloudFormation Outputs for keys ${missingKeys.join(', ')}`);
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', {});
-  new CoreDns(app, 'Dns', {});
+  new FluentBit(app, 'fluentbit', { saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName] });
+  new CoreDns(app, 'dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {
     clusterName: ClusterName,
diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 3ad60be92..769a2b1b0 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -3,8 +3,12 @@ import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';
 
+export interface FluentBitProps {
+  saRoleName: string;
+}
+
 export class FluentBit extends Chart {
-  constructor(scope: Construct, id: string, props: ChartProps) {
+  constructor(scope: Construct, id: string, props: FluentBitProps & ChartProps) {
     super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
@@ -25,7 +29,7 @@ export class FluentBit extends Chart {
       version: '0.1.30',
       values: {
         input: { parser: FluentParserName, dockerMode: 'Off' },
-        serviceAccount: { name: 'aws-for-fluent-bit-sa', create: false },
+        serviceAccount: { name: props.saRoleName, create: false },
         cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },
         firehose: { enabled: false },
         kinesis: { enabled: false },
diff --git a/config/constants.ts b/config/constants.ts
index 1d2c252eb..effc3ec9b 100644
--- a/config/constants.ts
+++ b/config/constants.ts
@@ -9,4 +9,7 @@ export const CfnOutputKeys = {
     ClusterEndpoint: 'ClusterEndpoint',
     DefaultInstanceProfile: 'DefaultInstanceProfile',
   },
+  FluentBit: {
+    ServiceAccountName: 'FluentBitServiceAccountName',
+  },
 };
diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index 9adfcf960..3e68c2b07 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -1,6 +1,6 @@
 import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27';
 import { Aws, CfnOutput, Duration, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
-import { InstanceType, IVpc, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
+import { IVpc, InstanceType, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
 import { Cluster, ClusterLoggingTypes, IpFamily, KubernetesVersion, NodegroupAmiType } from 'aws-cdk-lib/aws-eks';
 import {
   CfnInstanceProfile,
@@ -11,8 +11,7 @@ import {
   Role,
   ServicePrincipal,
 } from 'aws-cdk-lib/aws-iam';
-import { IBucket } from 'aws-cdk-lib/aws-s3';
-import { BlockPublicAccess, Bucket } from 'aws-cdk-lib/aws-s3';
+import { BlockPublicAccess, Bucket, IBucket } from 'aws-cdk-lib/aws-s3';
 import { Construct } from 'constructs';
 
 import { CfnOutputKeys } from '../constants';
@@ -199,7 +198,8 @@ export class LinzEksCluster extends Stack {
       namespace: 'fluent-bit',
     });
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
-    new CfnOutput(this, 'FluentBitServiceAccountRoleArn', { value: fluentBitSa.role.roleArn });
+
+    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.name });
 
     // Basic constructs for argo to be deployed into
     const argoNs = this.cluster.addManifest('ArgoNameSpace', {
diff --git a/package-lock.json b/package-lock.json
index 4714a41d3..4fea19ccc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2958,18 +2958,24 @@
     },
     "node_modules/cdk8s-plus-25/node_modules/balanced-match": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-25/node_modules/concat-map": {
       "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-25/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -3014,18 +3020,24 @@
     },
     "node_modules/cdk8s-plus-27/node_modules/balanced-match": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-27/node_modules/concat-map": {
       "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s-plus-27/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -3048,12 +3060,16 @@
     },
     "node_modules/cdk8s/node_modules/fast-json-patch": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/cdk8s/node_modules/follow-redirects": {
       "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "dev": true,
       "funding": [
         {
@@ -3074,6 +3090,8 @@
     },
     "node_modules/cdk8s/node_modules/yaml": {
       "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",

From 46d33507b1e7a9393463275f38e29b4bae0438f2 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:21:05 +1300
Subject: [PATCH 20/34] fix: clustername refactor not saved

---
 config/cdk.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/cdk.ts b/config/cdk.ts
index 27fc83b3c..fa9382746 100644
--- a/config/cdk.ts
+++ b/config/cdk.ts
@@ -1,12 +1,12 @@
 import { App } from 'aws-cdk-lib';
 
-import { CLUSTER_NAME } from './constants';
+import { ClusterName } from './constants';
 import { LinzEksCluster } from './eks/cluster';
 
 const app = new App();
 
 async function main(): Promise<void> {
-  new LinzEksCluster(app, CLUSTER_NAME, {
+  new LinzEksCluster(app, ClusterName, {
     env: { region: 'ap-southeast-2', account: process.env.CDK_DEFAULT_ACCOUNT },
   });
 

From 59d1f4c2be5dd87b1d0638943eb2ebecfc2592dd Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:21:24 +1300
Subject: [PATCH 21/34] fix: typo and wrong namespace

---
 config/charts/fluentbit.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 769a2b1b0..8334d1f83 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -25,9 +25,10 @@ export class FluentBit extends Chart {
     new Helm(this, 'aws-for-fluent-bit', {
       chart: 'aws-for-fluent-bit',
       repo: 'https://aws.github.io/eks-charts',
-      namespace: 'kube-system',
+      namespace: 'fluent-bit',
       version: '0.1.30',
       values: {
+        fullnameOverride: 'fluentbit',
         input: { parser: FluentParserName, dockerMode: 'Off' },
         serviceAccount: { name: props.saRoleName, create: false },
         cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },

From 25f2990283e369d0af1859593efef0c2f9df9ccc Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:22:14 +1300
Subject: [PATCH 22/34] chore: noting fullnameOverride not working?

---
 config/charts/karpenter.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/charts/karpenter.ts b/config/charts/karpenter.ts
index 1b1d8c20a..5c532b781 100644
--- a/config/charts/karpenter.ts
+++ b/config/charts/karpenter.ts
@@ -69,6 +69,7 @@ export class Karpenter extends Chart {
       namespace: 'karpenter',
       version: 'v0.31.1',
       values: {
+        // FIXME: fullnameOverride: 'karpenter',
         serviceAccount: {
           create: false,
           name: props.saRoleName,

From 1691ee472bbbfc37c2f59a90ee1b4131f5c0750c Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:22:29 +1300
Subject: [PATCH 23/34] fix: incorrect name

---
 config/eks/cluster.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index 3e68c2b07..d5bf5ae62 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -199,7 +199,7 @@ export class LinzEksCluster extends Stack {
     });
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
 
-    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.name });
+    new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.serviceAccountName });
 
     // Basic constructs for argo to be deployed into
     const argoNs = this.cluster.addManifest('ArgoNameSpace', {

From b1a323b8b681b7fbb6271be1a91d95efcf60b021 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Wed, 25 Oct 2023 14:24:05 +1300
Subject: [PATCH 24/34] fix: format imports

---
 config/eks/cluster.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index d5bf5ae62..c4725feec 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -1,6 +1,6 @@
 import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27';
 import { Aws, CfnOutput, Duration, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
-import { IVpc, InstanceType, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
+import { InstanceType, IVpc, SubnetType, Vpc } from 'aws-cdk-lib/aws-ec2';
 import { Cluster, ClusterLoggingTypes, IpFamily, KubernetesVersion, NodegroupAmiType } from 'aws-cdk-lib/aws-eks';
 import {
   CfnInstanceProfile,

From 02a4fcc9f54b111b10353f8d67e490e1d87d32ed Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Thu, 26 Oct 2023 14:39:27 +1300
Subject: [PATCH 25/34] fix: make fluentbit dependent on coredns

---
 config/cdk8s.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index be77258a8..458bd5805 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -20,8 +20,12 @@ async function main(): Promise<void> {
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', { saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName] });
-  new CoreDns(app, 'dns', {});
+
+  const coredns = new CoreDns(app, 'dns', {});
+  const fluentbit = new FluentBit(app, 'fluentbit', {
+    saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName],
+  });
+  fluentbit.addDependency(coredns);
 
   const karpenter = new Karpenter(app, 'karpenter', {
     clusterName: ClusterName,

From 4ab3015fd4318adde7d034477c068b6e24135d6a Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Thu, 26 Oct 2023 14:41:12 +1300
Subject: [PATCH 26/34] fix: resolve `Liveness probe failed` error

---
 config/charts/fluentbit.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 8334d1f83..2b876d342 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -14,7 +14,7 @@ export class FluentBit extends Chart {
     const FluentParserName = 'containerd';
     // This needs to be properly formatted, and it was taken directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
     // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
-    const FluentContainerParser = `[PARSER]
+    const extraParsers = `[PARSER]
         Name ${FluentParserName}
         Format regex
         Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
@@ -22,6 +22,17 @@ export class FluentBit extends Chart {
         Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     `;
 
+    // HTTP_Listen changed to `[::]` https://github.com/aws/eks-charts/issues/983
+    const extraService = `
+HTTP_Server  On
+HTTP_Listen  [::]
+HTTP_PORT    2020
+Health_Check On 
+HC_Errors_Count 5 
+HC_Retry_Failure_Count 5 
+HC_Period 5 
+`;
+
     new Helm(this, 'aws-for-fluent-bit', {
       chart: 'aws-for-fluent-bit',
       repo: 'https://aws.github.io/eks-charts',
@@ -35,7 +46,7 @@ export class FluentBit extends Chart {
         firehose: { enabled: false },
         kinesis: { enabled: false },
         elasticsearch: { enabled: false },
-        service: { extraParsers: FluentContainerParser },
+        service: { extraParsers, extraService },
       },
     });
   }

From ce76ba8dd838c3367d9565c1c40b9e8ec6e9f580 Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Thu, 26 Oct 2023 14:59:23 +1300
Subject: [PATCH 27/34] fix: use older version of fluentbit to fix `Liveness
 probe failed`

---
 config/charts/fluentbit.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 2b876d342..2a4f30f30 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -9,7 +9,7 @@ export interface FluentBitProps {
 
 export class FluentBit extends Chart {
   constructor(scope: Construct, id: string, props: FluentBitProps & ChartProps) {
-    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
+    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.21.5', 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
     // This needs to be properly formatted, and it was taken directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
@@ -37,7 +37,7 @@ HC_Period 5
       chart: 'aws-for-fluent-bit',
       repo: 'https://aws.github.io/eks-charts',
       namespace: 'fluent-bit',
-      version: '0.1.30',
+      version: '0.1.23',
       values: {
         fullnameOverride: 'fluentbit',
         input: { parser: FluentParserName, dockerMode: 'Off' },

From 4029a41f745ef4b95e1524d3891b68fe254fa264 Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Thu, 26 Oct 2023 16:21:26 +1300
Subject: [PATCH 28/34] fix: fluentbit config and namespace

---
 config/README.md           |  1 -
 config/cdk8s.ts            |  5 ++++-
 config/charts/fluentbit.ts | 42 +++++++++++++++++++++++++++++---------
 config/eks/cluster.ts      | 11 +++++++---
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/config/README.md b/config/README.md
index 93df4ab8e..07b8af353 100644
--- a/config/README.md
+++ b/config/README.md
@@ -54,7 +54,6 @@ However, some of the component Helm charts do not have a `values.schema.json`. F
 
 - aws-for-fluent-bit (<https://github.com/aws/eks-charts/issues/1011>)
 
-
 ## Usage (for test)
 
 Ensure all dependencies are installed
diff --git a/config/cdk8s.ts b/config/cdk8s.ts
index be77258a8..a42312c1b 100644
--- a/config/cdk8s.ts
+++ b/config/cdk8s.ts
@@ -20,7 +20,10 @@ async function main(): Promise<void> {
   }
 
   new ArgoSemaphore(app, 'semaphore', {});
-  new FluentBit(app, 'fluentbit', { saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName] });
+  new FluentBit(app, 'fluentbit', {
+    saRoleName: cfnOutputs[CfnOutputKeys.FluentBit.ServiceAccountName],
+    clusterName: ClusterName,
+  });
   new CoreDns(app, 'dns', {});
 
   const karpenter = new Karpenter(app, 'karpenter', {
diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 8334d1f83..742617641 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -3,39 +3,61 @@ import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';
 
+const awsForFluentBitVersion = '0.1.31';
 export interface FluentBitProps {
   saRoleName: string;
+  clusterName: string;
 }
 
 export class FluentBit extends Chart {
   constructor(scope: Construct, id: string, props: FluentBitProps & ChartProps) {
-    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', '2.31.11', 'logs', 'workflows'));
+    super(scope, id, applyDefaultLabels(props, 'aws-for-fluent-bit', awsForFluentBitVersion, 'logs', 'workflows'));
 
     const FluentParserName = 'containerd';
     // This needs to be properly formatted, and it was taken directly from https://github.com/microsoft/fluentbit-containerd-cri-o-json-log
     // The key part is the message must be parsed as "log" otherwise it wont be parsed as JSON
     const FluentContainerParser = `[PARSER]
-        Name ${FluentParserName}
-        Format regex
-        Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
-        Time_Key    time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L%z
+    Name ${FluentParserName}
+    Format regex
+    Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
+    Time_Key    time
+    Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     `;
 
+    const extraService = `
+HTTP_Server  Off
+HTTP_Listen  [::]
+HTTP_PORT    2020
+Health_Check On 
+HC_Errors_Count 5 
+HC_Retry_Failure_Count 5 
+HC_Period 5 
+`;
+
     new Helm(this, 'aws-for-fluent-bit', {
       chart: 'aws-for-fluent-bit',
       repo: 'https://aws.github.io/eks-charts',
-      namespace: 'fluent-bit',
-      version: '0.1.30',
+      namespace: 'fluentbit',
+      version: awsForFluentBitVersion,
       values: {
         fullnameOverride: 'fluentbit',
         input: { parser: FluentParserName, dockerMode: 'Off' },
         serviceAccount: { name: props.saRoleName, create: false },
-        cloudWatchLogs: { enabled: true, region: 'ap-southeast-2', autoCreateGroup: true, logRetentionDays: 30 },
+        cloudWatchLogs: {
+          enabled: true,
+          region: 'ap-southeast-2',
+          autoCreateGroup: true,
+          logRetentionDays: 30,
+          logGroupName: `/aws/eks/${props.clusterName}/logs`,
+          logGroupTemplate: `/aws/eks/${props.clusterName}/workload/$kubernetes['namespace_name']`,
+          logStreamPrefix: 'fb-',
+        },
         firehose: { enabled: false },
         kinesis: { enabled: false },
         elasticsearch: { enabled: false },
-        service: { extraParsers: FluentContainerParser },
+        service: { extraParsers: FluentContainerParser, extraService },
+        livenessProbe: false,
+        readinessProbe: false,
       },
     });
   }
diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index c4725feec..fa62458b5 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -191,12 +191,17 @@ export class LinzEksCluster extends Stack {
     const fluentBitNs = this.cluster.addManifest('FluentBitNamespace', {
       apiVersion: 'v1',
       kind: 'Namespace',
-      metadata: { name: 'fluent-bit' },
+      metadata: { name: 'fluentbit' },
     });
     const fluentBitSa = this.cluster.addServiceAccount('FluentBitServiceAccount', {
-      name: 'fluent-bit-sa',
-      namespace: 'fluent-bit',
+      name: 'fluentbit-sa',
+      namespace: 'fluentbit',
     });
+    // https://docs.aws.amazon.com/aws-managed-policy/latest/reference/CloudWatchAgentServerPolicy.html
+    fluentBitSa.role.addManagedPolicy(ManagedPolicy.fromAwsManagedPolicyName('CloudWatchAgentServerPolicy'));
+    fluentBitSa.role.addToPrincipalPolicy(
+      new PolicyStatement({ actions: ['logs:PutRetentionPolicy'], resources: ['*'], effect: Effect.ALLOW }),
+    );
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
 
     new CfnOutput(this, CfnOutputKeys.FluentBit.ServiceAccountName, { value: fluentBitSa.serviceAccountName });

From 7ac2fc9a6f6972791b0c4669869b00109999a932 Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Thu, 26 Oct 2023 16:29:03 +1300
Subject: [PATCH 29/34] docs: improve comment

---
 config/charts/fluentbit.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 624837f4a..ec4a11cec 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';
 
+/** version of the Helm chart (not FluentBit app) */
 const awsForFluentBitVersion = '0.1.31';
 export interface FluentBitProps {
   saRoleName: string;

From 09df034c6411c948a8bc357a1e681a66da8a556d Mon Sep 17 00:00:00 2001
From: Megan Davidson <mdavidson@linz.govt.nz>
Date: Fri, 27 Oct 2023 09:57:16 +1300
Subject: [PATCH 30/34] chore: add docs for fixme comment

---
 config/charts/karpenter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/charts/karpenter.ts b/config/charts/karpenter.ts
index 5c532b781..743aa41f4 100644
--- a/config/charts/karpenter.ts
+++ b/config/charts/karpenter.ts
@@ -69,7 +69,7 @@ export class Karpenter extends Chart {
       namespace: 'karpenter',
       version: 'v0.31.1',
       values: {
-        // FIXME: fullnameOverride: 'karpenter',
+        // FIXME: fullnameOverride: 'karpenter' // this value did not override the name during testing
         serviceAccount: {
           create: false,
           name: props.saRoleName,

From c7828570c43439a0a0adf943d6f3313cdbb48dcf Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 27 Oct 2023 10:42:10 +1300
Subject: [PATCH 31/34] fix: helm create a generated name for karpenter

---
 config/charts/karpenter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/charts/karpenter.ts b/config/charts/karpenter.ts
index 743aa41f4..505f85ecd 100644
--- a/config/charts/karpenter.ts
+++ b/config/charts/karpenter.ts
@@ -69,7 +69,7 @@ export class Karpenter extends Chart {
       namespace: 'karpenter',
       version: 'v0.31.1',
       values: {
-        // FIXME: fullnameOverride: 'karpenter' // this value did not override the name during testing
+        fullnameOverride: 'karpenter', // override the karpenter-abcxywz
         serviceAccount: {
           create: false,
           name: props.saRoleName,

From f2250d1107af046070a1a80512d7310c6b206cbf Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 27 Oct 2023 10:45:57 +1300
Subject: [PATCH 32/34] docs: remove fixme

---
 config/eks/cluster.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/eks/cluster.ts b/config/eks/cluster.ts
index fa62458b5..d8bba3adc 100644
--- a/config/eks/cluster.ts
+++ b/config/eks/cluster.ts
@@ -137,7 +137,7 @@ export class LinzEksCluster extends Stack {
     );
 
     // Allow Karpenter to start ec2 instances
-    // FIXME: some policies are missing. See https://github.com/aws/karpenter/blob/8c33a40733b90aa0bb42a6436152374f7b359f69/website/content/en/docs/getting-started/getting-started-with-karpenter/cloudformation.yaml#L40
+    // @see https://github.com/aws/karpenter/blob/8c33a40733b90aa0bb42a6436152374f7b359f69/website/content/en/docs/getting-started/getting-started-with-karpenter/cloudformation.yaml#L40
     // The current policies are based on https://github.com/eksctl-io/eksctl/blob/main/pkg/cfn/builder/karpenter_test.go#L111
     new Policy(this, 'ControllerPolicy', {
       roles: [serviceAccount.role],

From 18c88a021908b6702cb71819984d568da7836d34 Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 27 Oct 2023 10:58:03 +1300
Subject: [PATCH 33/34] docs: link extraservice to github issues

---
 config/charts/fluentbit.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index ec4a11cec..7260042f8 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -25,6 +25,12 @@ export class FluentBit extends Chart {
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     `;
 
+    /**
+     * FIXME: We deactivated the HTTP server to avoid getting these issues:
+     * https://github.com/aws/eks-charts/issues/995
+     * https://github.com/aws/eks-charts/issues/983
+     *
+     */
     const extraService = `
 HTTP_Server  Off
 HTTP_Listen  [::]

From 0dd7883612fa5866c907d1256aabd54364c9f5ce Mon Sep 17 00:00:00 2001
From: Paul Fouquet <pfouquet@linz.govt.nz>
Date: Fri, 27 Oct 2023 11:00:11 +1300
Subject: [PATCH 34/34] docs: link livenessProbe to github issues

---
 config/charts/fluentbit.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/charts/fluentbit.ts b/config/charts/fluentbit.ts
index 7260042f8..4e75e31d2 100644
--- a/config/charts/fluentbit.ts
+++ b/config/charts/fluentbit.ts
@@ -26,8 +26,7 @@ export class FluentBit extends Chart {
     `;
 
     /**
-     * FIXME: We deactivated the HTTP server to avoid getting these issues:
-     * https://github.com/aws/eks-charts/issues/995
+     * FIXME: We deactivated the HTTP server to avoid getting this issue:
      * https://github.com/aws/eks-charts/issues/983
      *
      */
@@ -63,6 +62,7 @@ HC_Period 5
         kinesis: { enabled: false },
         elasticsearch: { enabled: false },
         service: { extraParsers, extraService },
+        // FIXME: `livenessProbe` and `readinessProbe` deactivated https://github.com/aws/eks-charts/issues/995
         livenessProbe: false,
         readinessProbe: false,
       },