Add latest k8s versions in testing (#26729)

ChrsMark · web-flow · commit 16544896c4f4 · 2021-07-07T20:43:52.000+03:00
diff --git a/.ci/scripts/kind-setup.sh b/.ci/scripts/kind-setup.sh
@@ -1,5 +1,23 @@
 #!/usr/bin/env bash
 set -exuo pipefail
 
-kind create cluster --image kindest/node:${K8S_VERSION}
+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
 kubectl cluster-info
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -300,7 +300,7 @@ def k8sTest(Map args = [:]) {
   versions.each{ v ->
     withNode(labels: args.label, forceWorkspace: true){
       stage("${args.context} ${v}"){
-        withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){
+        withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.11.1", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){
           withGithubNotify(context: "${args.context} ${v}") {
             withBeatsEnv(archive: false, withModule: false) {
               retryWithSleep(retries: 2, seconds: 5, backoff: true){ sh(label: "Install kind", script: ".ci/scripts/install-kind.sh") }
diff --git a/deploy/kubernetes/Jenkinsfile.yml b/deploy/kubernetes/Jenkinsfile.yml
@@ -18,5 +18,5 @@ stages:
             make check-no-changes;
         stage: lint
     k8sTest:
-        k8sTest: "v1.18.2,v1.17.2,v1.16.4,v1.15.7,v1.14.10"
+        k8sTest: "v1.21.1,v1.20.7,v1.19.11,v1.18.19,v1.17.17,v1.14.10"
         stage: mandatory
diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -148,7 +148,8 @@ roleRef:
 [float]
 === Compatibility
 
-The Kubernetes module is tested with Kubernetes 1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, and 1.18.x
+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
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/kubernetes/_meta/docs.asciidoc b/metricbeat/module/kubernetes/_meta/docs.asciidoc
@@ -141,7 +141,8 @@ roleRef:
 [float]
 === Compatibility
 
-The Kubernetes module is tested with Kubernetes 1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, and 1.18.x
+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
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go b/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 func TestFetchMetricset(t *testing.T) {
-	config := test.GetAPIServerConfig(t, "controllermanager")
+	config := test.GetControllerManagerConfig(t, "controllermanager")
 	metricSet := mbtest.NewFetcher(t, config)
 	events, errs := metricSet.FetchEvents()
 	if len(errs) > 0 {
diff --git a/metricbeat/module/kubernetes/test/integration.go b/metricbeat/module/kubernetes/test/integration.go
@@ -71,11 +71,11 @@ func GetKubeProxyConfig(t *testing.T, metricSetName string) map[string]interface
 		"module":     "kubernetes",
 		"metricsets": []string{metricSetName},
 		"host":       "${NODE_NAME}",
-		"hosts":      []string{"localhost:10252"},
+		"hosts":      []string{"localhost:10249"},
 	}
 }
 
-// GetSchedulerConfig function returns configuration for talking to kube-proxy.
+// GetSchedulerConfig function returns configuration for talking to kube-scheduler.
 func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface{} {
 	t.Helper()
 	return map[string]interface{}{
@@ -85,3 +85,14 @@ func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface
 		"hosts":      []string{"localhost:10251"},
 	}
 }
+
+// GetControllerManagerConfig function returns configuration for talking to kube-controller-manager.
+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{"localhost:10252"},
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`func TestFetchMetricset(t *testing.T) {`
`32`		`- config := test.GetAPIServerConfig(t, "controllermanager")`
	`32`	`+ config := test.GetControllerManagerConfig(t, "controllermanager")`
`33`	`33`	`metricSet := mbtest.NewFetcher(t, config)`
`34`	`34`	`events, errs := metricSet.FetchEvents()`
`35`	`35`	`if len(errs) > 0 {`