From a9d0b0b504da35fd6db347a7536800f2faf3e3de Mon Sep 17 00:00:00 2001
From: gsantoro <giuseppe.santoro@elastic.co>
Date: Wed, 24 May 2023 17:10:29 +0200
Subject: [PATCH 1/2] fix system test for kubernetes integration for k8s
 v1.27.0

---
 packages/kubernetes/_dev/deploy/k8s/ss.yaml                  | 2 +-
 packages/kubernetes/changelog.yml                            | 5 +++++
 packages/kubernetes/data_stream/container_logs/manifest.yml  | 1 +
 packages/kubernetes/data_stream/state_node/fields/fields.yml | 1 +
 .../kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json     | 2 +-
 packages/kubernetes/manifest.yml                             | 2 +-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/kubernetes/_dev/deploy/k8s/ss.yaml b/packages/kubernetes/_dev/deploy/k8s/ss.yaml
index 037d9138378..39fe1538d0d 100644
--- a/packages/kubernetes/_dev/deploy/k8s/ss.yaml
+++ b/packages/kubernetes/_dev/deploy/k8s/ss.yaml
@@ -16,7 +16,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: nginx
-          image: k8s.gcr.io/nginx-slim:0.8
+          image: docker.io/nginx:1.24.0-alpine-slim
           ports:
             - containerPort: 80
               name: web
diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml
index 987d65b904c..c896c0bec17 100644
--- a/packages/kubernetes/changelog.yml
+++ b/packages/kubernetes/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.40.0"
+  changes:
+    - description: Fix system tests for kubernetes integration for k8s v1.27.0 
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/1
 - version: "1.40.0-beta.1"
   changes:
     - description: Fix proxy and scheduler visualization with missing sort field.
diff --git a/packages/kubernetes/data_stream/container_logs/manifest.yml b/packages/kubernetes/data_stream/container_logs/manifest.yml
index 9bad9b2dbb9..0f15117c872 100644
--- a/packages/kubernetes/data_stream/container_logs/manifest.yml
+++ b/packages/kubernetes/data_stream/container_logs/manifest.yml
@@ -25,6 +25,7 @@ streams:
         title: Dataset name
         description: >
           Set the name for your dataset. Changing the dataset will send the data to a different index. For more info look at [data_stream field](https://www.elastic.co/guide/en/ecs/master/ecs-data_stream.html).
+
         type: text
       - name: containerParserStream
         type: text
diff --git a/packages/kubernetes/data_stream/state_node/fields/fields.yml b/packages/kubernetes/data_stream/state_node/fields/fields.yml
index 092fd8609d2..3673abd7b8a 100644
--- a/packages/kubernetes/data_stream/state_node/fields/fields.yml
+++ b/packages/kubernetes/data_stream/state_node/fields/fields.yml
@@ -28,6 +28,7 @@
           type: keyword
           description: >
             Node NetworkUnavailable status (true, false or unknown)
+
     - name: cpu
       type: group
       fields:
diff --git a/packages/kubernetes/kibana/dashboard/kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json b/packages/kubernetes/kibana/dashboard/kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json
index ca20de367b2..c4ecb49574f 100644
--- a/packages/kubernetes/kibana/dashboard/kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json
+++ b/packages/kubernetes/kibana/dashboard/kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json
@@ -3184,4 +3184,4 @@
     "type": "dashboard",
     "updated_at": "2023-01-11T16:15:05.999Z",
     "version": "WzM0NTEsMV0="
-}
+}
\ No newline at end of file
diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml
index 116ff385fc1..028ad8055f7 100644
--- a/packages/kubernetes/manifest.yml
+++ b/packages/kubernetes/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: kubernetes
 title: Kubernetes
-version: 1.40.0-beta.1
+version: 1.40.0
 license: basic
 description: Collect logs and metrics from Kubernetes clusters with Elastic Agent (TSDB Beta).
 type: integration

From d77db00031786524bc3b23ef922771a1ea91ae07 Mon Sep 17 00:00:00 2001
From: gsantoro <giuseppe.santoro@elastic.co>
Date: Fri, 26 May 2023 10:42:17 +0200
Subject: [PATCH 2/2] updated changelog

---
 packages/kubernetes/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml
index 3d67e8a8993..de9858540ae 100644
--- a/packages/kubernetes/changelog.yml
+++ b/packages/kubernetes/changelog.yml
@@ -3,7 +3,7 @@
   changes:
     - description: Fix system tests for kubernetes integration for k8s v1.27.0 
       type: bugfix
-      link: https://github.com/elastic/integrations/pull/1
+      link: https://github.com/elastic/integrations/pull/6310
 - version: "1.40.0-beta.2"
   changes:
     - description: Fix volume dashboard.