From 84a935389b39b9aec04e9211780a498644b96c89 Mon Sep 17 00:00:00 2001
From: alesnovak-s1 <138495238+alesnovak-s1@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:32:20 +0100
Subject: [PATCH] Agent release 2.2.18 (#1307)

* Agent release 2.2.18

* Update CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: Jenkins Automation <jenkins@scalyr.com>
---
 CHANGELOG.md                              | 12 ++++++++++++
 VERSION                                   |  2 +-
 k8s/default-namespace/scalyr-agent-2.yaml |  2 +-
 k8s/no-kustomize/scalyr-agent-2.yaml      |  2 +-
 k8s/scalyr-agent-2-envfrom.yaml           |  2 +-
 k8s/scalyr-agent-2.yaml                   |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8250a67c2..52429ba48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Scalyr Agent 2 Changes By Release
 =================================
 
+## 2.2.18 "Zack" - Nov 5, 2024
+<!---
+Packaged by Ales Novak <ales.novak@sentinelone.com> on Nov 5, 2024 00:00 -0800
+--->
+
+Changes:
+* Introducing a a new config key `agent_status_timeout` and setting it to 30s by default. Until version 2.2.17 it was hardcoded to 5 seconds.
+
+Fixes:
+* Fixed a bug where pod logs were removed from ingestion because of a temporrary K8s API error and the agent was not able to add them again.
+
+  
 ## 2.2.17 "Sinthia" - Sep 17, 2024
 <!---
 Packaged by Ales Novak <ales.novak@sentinelone.com> on Sep 17, 2024 00:00 -0800
diff --git a/VERSION b/VERSION
index a8e6cefec..ab554c550 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.17
\ No newline at end of file
+2.2.18
\ No newline at end of file
diff --git a/k8s/default-namespace/scalyr-agent-2.yaml b/k8s/default-namespace/scalyr-agent-2.yaml
index f2060a036..c90956087 100644
--- a/k8s/default-namespace/scalyr-agent-2.yaml
+++ b/k8s/default-namespace/scalyr-agent-2.yaml
@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.17
+        image: scalyr/scalyr-k8s-agent:2.2.18
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:
diff --git a/k8s/no-kustomize/scalyr-agent-2.yaml b/k8s/no-kustomize/scalyr-agent-2.yaml
index f26d557b5..7057ff18d 100644
--- a/k8s/no-kustomize/scalyr-agent-2.yaml
+++ b/k8s/no-kustomize/scalyr-agent-2.yaml
@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.17
+        image: scalyr/scalyr-k8s-agent:2.2.18
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:
diff --git a/k8s/scalyr-agent-2-envfrom.yaml b/k8s/scalyr-agent-2-envfrom.yaml
index dd0369b2f..b0e306eb6 100644
--- a/k8s/scalyr-agent-2-envfrom.yaml
+++ b/k8s/scalyr-agent-2-envfrom.yaml
@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.17
+        image: scalyr/scalyr-k8s-agent:2.2.18
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:
diff --git a/k8s/scalyr-agent-2.yaml b/k8s/scalyr-agent-2.yaml
index 27e979bcc..7867edb21 100644
--- a/k8s/scalyr-agent-2.yaml
+++ b/k8s/scalyr-agent-2.yaml
@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.17
+        image: scalyr/scalyr-k8s-agent:2.2.18
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext: