From af8536b907097fce414a4e2124197d8a9ec94f69 Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Mon, 20 Nov 2023 14:11:12 -0500 Subject: [PATCH 1/5] [MANIFEST] Turning off TLS verification on kubernetes filter (#2206) * Turning off TLS verification on kubernetes filter * Upping prod wait time in fluent bit to 10s --- env/dev/fluentbit.yaml | 4 ++++ env/production/fluentbit.yaml | 3 ++- env/scratch/fluentbit.yaml | 3 +++ env/staging/fluentbit.yaml | 7 +++---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/env/dev/fluentbit.yaml b/env/dev/fluentbit.yaml index fb88b3b9e..2fdcc19a3 100644 --- a/env/dev/fluentbit.yaml +++ b/env/dev/fluentbit.yaml @@ -129,6 +129,7 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off [OUTPUT] Name cloudwatch @@ -168,6 +169,8 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off + [FILTER] name multiline @@ -330,6 +333,7 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: + priorityClassName: system-node-critical containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/production/fluentbit.yaml b/env/production/fluentbit.yaml index 747f20a55..10619bced 100644 --- a/env/production/fluentbit.yaml +++ b/env/production/fluentbit.yaml @@ -331,10 +331,11 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: + priorityClassName: system-node-critical initContainers: - name: wait-for-init image: busybox:1.28 - command: ['sh', '-c', 'echo "Waiting for 2 seconds for node to sort itself out" && sleep 2'] + command: ['sh', '-c', 'echo "Waiting for 10 seconds for node to sort itself out" && sleep 10'] containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/scratch/fluentbit.yaml b/env/scratch/fluentbit.yaml index c6b65cd09..8c40befde 100644 --- a/env/scratch/fluentbit.yaml +++ b/env/scratch/fluentbit.yaml @@ -129,6 +129,7 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off [OUTPUT] Name cloudwatch @@ -168,6 +169,7 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off [FILTER] name multiline @@ -330,6 +332,7 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: + priorityClassName: system-node-critical containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/staging/fluentbit.yaml b/env/staging/fluentbit.yaml index 874bf2b6c..6760ff8cf 100644 --- a/env/staging/fluentbit.yaml +++ b/env/staging/fluentbit.yaml @@ -133,6 +133,7 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off [OUTPUT] Name cloudwatch @@ -175,6 +176,7 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 + tls.verify Off [FILTER] name multiline @@ -352,10 +354,7 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: - initContainers: - - name: wait-for-init - image: busybox:1.28 - command: ['sh', '-c', 'echo "Waiting for 2 seconds for node to sort itself out" && sleep 2'] + priorityClassName: system-node-critical containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable From 59789c600bbccccf84e5d80e0e6704e1310e36d7 Mon Sep 17 00:00:00 2001 From: Notify PR Bot Date: Mon, 20 Nov 2023 19:11:42 +0000 Subject: [PATCH 2/5] New release: v0.65.11 -> v0.65.13 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b7ca583b8..90e6ae415 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.65.11 +v0.65.13 From 7e611be4e6ab44a7dc9dbcc230849c3736e36c32 Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Mon, 20 Nov 2023 14:32:53 -0500 Subject: [PATCH 3/5] Revert "[MANIFEST] Turning off TLS verification on kubernetes filter (#2206)" (#2207) This reverts commit af8536b907097fce414a4e2124197d8a9ec94f69. --- env/dev/fluentbit.yaml | 4 ---- env/production/fluentbit.yaml | 3 +-- env/scratch/fluentbit.yaml | 3 --- env/staging/fluentbit.yaml | 7 ++++--- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/env/dev/fluentbit.yaml b/env/dev/fluentbit.yaml index 2fdcc19a3..fb88b3b9e 100644 --- a/env/dev/fluentbit.yaml +++ b/env/dev/fluentbit.yaml @@ -129,7 +129,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off [OUTPUT] Name cloudwatch @@ -169,8 +168,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off - [FILTER] name multiline @@ -333,7 +330,6 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: - priorityClassName: system-node-critical containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/production/fluentbit.yaml b/env/production/fluentbit.yaml index 10619bced..747f20a55 100644 --- a/env/production/fluentbit.yaml +++ b/env/production/fluentbit.yaml @@ -331,11 +331,10 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: - priorityClassName: system-node-critical initContainers: - name: wait-for-init image: busybox:1.28 - command: ['sh', '-c', 'echo "Waiting for 10 seconds for node to sort itself out" && sleep 10'] + command: ['sh', '-c', 'echo "Waiting for 2 seconds for node to sort itself out" && sleep 2'] containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/scratch/fluentbit.yaml b/env/scratch/fluentbit.yaml index 8c40befde..c6b65cd09 100644 --- a/env/scratch/fluentbit.yaml +++ b/env/scratch/fluentbit.yaml @@ -129,7 +129,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off [OUTPUT] Name cloudwatch @@ -169,7 +168,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off [FILTER] name multiline @@ -332,7 +330,6 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: - priorityClassName: system-node-critical containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable diff --git a/env/staging/fluentbit.yaml b/env/staging/fluentbit.yaml index 6760ff8cf..874bf2b6c 100644 --- a/env/staging/fluentbit.yaml +++ b/env/staging/fluentbit.yaml @@ -133,7 +133,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off [OUTPUT] Name cloudwatch @@ -176,7 +175,6 @@ data: Use_Kubelet On Kubelet_Port 10250 Buffer_Size 0 - tls.verify Off [FILTER] name multiline @@ -354,7 +352,10 @@ spec: version: v1 kubernetes.io/cluster-service: "true" spec: - priorityClassName: system-node-critical + initContainers: + - name: wait-for-init + image: busybox:1.28 + command: ['sh', '-c', 'echo "Waiting for 2 seconds for node to sort itself out" && sleep 2'] containers: - name: fluent-bit image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable From 30eacebb4b43f8c45fe42314e059d7bfb2dbee25 Mon Sep 17 00:00:00 2001 From: Notify PR Bot Date: Mon, 20 Nov 2023 19:33:12 +0000 Subject: [PATCH 4/5] New release: v0.65.13 -> v0.65.14 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 90e6ae415..c89b496ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.65.13 +v0.65.14 From e01267dd6cda610fd5a698a28e5c3877b5a1562f Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Mon, 20 Nov 2023 14:40:42 -0500 Subject: [PATCH 5/5] V0.65.11 revert (#2208) * Turning off TLS verification on kubernetes filter * Reverting to previous manifest version * Update fluentbit.yaml --- VERSION | 2 +- env/production/fluentbit.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c89b496ce..b7ca583b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.65.14 +v0.65.11 diff --git a/env/production/fluentbit.yaml b/env/production/fluentbit.yaml index 747f20a55..fd2075368 100644 --- a/env/production/fluentbit.yaml +++ b/env/production/fluentbit.yaml @@ -435,4 +435,4 @@ spec: - operator: "Exists" effect: "NoExecute" - operator: "Exists" - effect: "NoSchedule" \ No newline at end of file + effect: "NoSchedule"