From 2606dcd246e26a114cf0b0a0ce7b8282bc97aa58 Mon Sep 17 00:00:00 2001
From: ChrsMark <chrismarkou92@gmail.com>
Date: Mon, 10 Jul 2023 16:25:03 +0300
Subject: [PATCH 1/3] Remove testing for k8s 1.14 and 1.17

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
---
 .ci/scripts/kind-setup.sh                     | 20 +---------------
 deploy/kubernetes/Jenkinsfile.yml             |  2 +-
 metricbeat/docs/modules/kubernetes.asciidoc   |  2 +-
 .../module/kubernetes/_meta/docs.asciidoc     |  2 +-
 .../module/kubernetes/test/integration.go     | 24 +++++++++----------
 5 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/.ci/scripts/kind-setup.sh b/.ci/scripts/kind-setup.sh
index d2c9eeeb771..fa4f66dd6e6 100755
--- a/.ci/scripts/kind-setup.sh
+++ b/.ci/scripts/kind-setup.sh
@@ -1,23 +1,5 @@
 #!/usr/bin/env bash
 set -exuo pipefail
 
-kind create cluster --image kindest/node:${K8S_VERSION} --config - <<EOF
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
-- role: control-plane
-  kubeadmConfigPatches:
-  - |
-    kind: ClusterConfiguration
-    scheduler:
-      extraArgs:
-        bind-address: "0.0.0.0"
-        port: "10251"
-        secure-port: "10259"
-    controllerManager:
-      extraArgs:
-        bind-address: "0.0.0.0"
-        port: "10252"
-        secure-port: "10257"
-EOF
+kind create cluster --image kindest/node:${K8S_VERSION}
 kubectl cluster-info
diff --git a/deploy/kubernetes/Jenkinsfile.yml b/deploy/kubernetes/Jenkinsfile.yml
index 53fd52ad377..53d944df4e8 100644
--- a/deploy/kubernetes/Jenkinsfile.yml
+++ b/deploy/kubernetes/Jenkinsfile.yml
@@ -18,5 +18,5 @@ stages:
             make check-no-changes;
         stage: lint
     k8sTest:
-        k8sTest: "v1.21.1,v1.20.7,v1.19.11,v1.18.19,v1.17.17,v1.14.10"
+        k8sTest: "v1.21.1,v1.20.7,v1.19.11,v1.18.19"
         stage: mandatory
diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
index f2b9f71c5f6..6789506da7e 100644
--- a/metricbeat/docs/modules/kubernetes.asciidoc
+++ b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -155,7 +155,7 @@ roleRef:
 === Compatibility
 
 The Kubernetes module is tested with the following versions of Kubernetes:
-1.14.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x
+1.18.x, 1.19.x, 1.20.x, 1.21.x
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/kubernetes/_meta/docs.asciidoc b/metricbeat/module/kubernetes/_meta/docs.asciidoc
index c2d193e896d..7acb60f82e1 100644
--- a/metricbeat/module/kubernetes/_meta/docs.asciidoc
+++ b/metricbeat/module/kubernetes/_meta/docs.asciidoc
@@ -146,7 +146,7 @@ roleRef:
 === Compatibility
 
 The Kubernetes module is tested with the following versions of Kubernetes:
-1.14.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x
+1.18.x, 1.19.x, 1.20.x, 1.21.x
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/kubernetes/test/integration.go b/metricbeat/module/kubernetes/test/integration.go
index 0b3e3c558af..f2675b339bf 100644
--- a/metricbeat/module/kubernetes/test/integration.go
+++ b/metricbeat/module/kubernetes/test/integration.go
@@ -79,10 +79,12 @@ func GetKubeProxyConfig(t *testing.T, metricSetName string) map[string]interface
 func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface{} {
 	t.Helper()
 	return map[string]interface{}{
-		"module":     "kubernetes",
-		"metricsets": []string{metricSetName},
-		"host":       "${NODE_NAME}",
-		"hosts":      []string{"http://0.0.0.0:10251"},
+		"module":                "kubernetes",
+		"metricsets":            []string{metricSetName},
+		"host":                  "${NODE_NAME}",
+		"hosts":                 []string{"https://0.0.0.0:10259"},
+		"bearer_token_file":     "/var/run/secrets/kubernetes.io/serviceaccount/token",
+		"ssl.verification_mode": "none",
 	}
 }
 
@@ -90,13 +92,11 @@ func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface
 func GetControllerManagerConfig(t *testing.T, metricSetName string) map[string]interface{} {
 	t.Helper()
 	return map[string]interface{}{
-		"module":            "kubernetes",
-		"metricsets":        []string{metricSetName},
-		"host":              "${NODE_NAME}",
-		"hosts":             []string{"https://0.0.0.0:10257"},
-		"bearer_token_file": "/var/run/secrets/kubernetes.io/serviceaccount/token",
-		"ssl": map[string]interface{}{
-			"verification_mode": "none",
-		},
+		"module":                "kubernetes",
+		"metricsets":            []string{metricSetName},
+		"host":                  "${NODE_NAME}",
+		"hosts":                 []string{"https://0.0.0.0:10257"},
+		"bearer_token_file":     "/var/run/secrets/kubernetes.io/serviceaccount/token",
+		"ssl.verification_mode": "none",
 	}
 }

From 7cc4de10963e0c99f982b8de4460e8ff6cddd342 Mon Sep 17 00:00:00 2001
From: ChrsMark <chrismarkou92@gmail.com>
Date: Mon, 10 Jul 2023 16:30:29 +0300
Subject: [PATCH 2/3] Upgrade kind version

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
---
 Jenkinsfile                       | 2 +-
 deploy/kubernetes/Jenkinsfile.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 121f87ac808..f6577f32d27 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
     SNAPSHOT = 'true'
     TERRAFORM_VERSION = "0.13.7"
     XPACK_MODULE_PATTERN = '^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*'
-    KIND_VERSION = 'v0.11.1'
+    KIND_VERSION = 'v0.15.0'
     K8S_VERSION = 'v1.21.1'
   }
   options {
diff --git a/deploy/kubernetes/Jenkinsfile.yml b/deploy/kubernetes/Jenkinsfile.yml
index 53d944df4e8..cef51b666a0 100644
--- a/deploy/kubernetes/Jenkinsfile.yml
+++ b/deploy/kubernetes/Jenkinsfile.yml
@@ -18,5 +18,5 @@ stages:
             make check-no-changes;
         stage: lint
     k8sTest:
-        k8sTest: "v1.21.1,v1.20.7,v1.19.11,v1.18.19"
+        k8sTest: "v1.21.14,v1.20.15,v1.19.16,v1.18.20"
         stage: mandatory

From 79c49d658f71778b2de0b9f955bfaa33defcf5b0 Mon Sep 17 00:00:00 2001
From: ChrsMark <chrismarkou92@gmail.com>
Date: Tue, 11 Jul 2023 12:40:03 +0300
Subject: [PATCH 3/3] Remove v1.18.20 k8s version from testing

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
---
 deploy/kubernetes/Jenkinsfile.yml                | 2 +-
 metricbeat/docs/modules/kubernetes.asciidoc      | 2 +-
 metricbeat/module/kubernetes/_meta/docs.asciidoc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/Jenkinsfile.yml b/deploy/kubernetes/Jenkinsfile.yml
index cef51b666a0..c5a760fa12e 100644
--- a/deploy/kubernetes/Jenkinsfile.yml
+++ b/deploy/kubernetes/Jenkinsfile.yml
@@ -18,5 +18,5 @@ stages:
             make check-no-changes;
         stage: lint
     k8sTest:
-        k8sTest: "v1.21.14,v1.20.15,v1.19.16,v1.18.20"
+        k8sTest: "v1.21.14,v1.20.15,v1.19.16"
         stage: mandatory
diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
index 6789506da7e..523bf560fcb 100644
--- a/metricbeat/docs/modules/kubernetes.asciidoc
+++ b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -155,7 +155,7 @@ roleRef:
 === Compatibility
 
 The Kubernetes module is tested with the following versions of Kubernetes:
-1.18.x, 1.19.x, 1.20.x, 1.21.x
+1.19.x, 1.20.x, 1.21.x
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/kubernetes/_meta/docs.asciidoc b/metricbeat/module/kubernetes/_meta/docs.asciidoc
index 7acb60f82e1..edff0907083 100644
--- a/metricbeat/module/kubernetes/_meta/docs.asciidoc
+++ b/metricbeat/module/kubernetes/_meta/docs.asciidoc
@@ -146,7 +146,7 @@ roleRef:
 === Compatibility
 
 The Kubernetes module is tested with the following versions of Kubernetes:
-1.18.x, 1.19.x, 1.20.x, 1.21.x
+1.19.x, 1.20.x, 1.21.x
 
 [float]
 === Dashboard