chore: bump helm versions (elastic#874)

* chore: bump helm charts version * chore: bump helm version * chore: bump kind version * fix: support filebeat deployment elastic/helm-charts#964 introduced the feature of deploying a Kubernetes deployment instead of a Daemonset using Filebeat, using a values.yaml syntax equivalent to Metricbeat * chore: update version to 7.11.2 # Conflicts: # .ci/Jenkinsfile
mdelapenya · Mar 16, 2021 · c3e8420 · c3e8420
1 parent 59b6b6a
commit c3e8420
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -47,9 +47,9 @@ pipeline {
     choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'TRACE', 'INFO'], description: 'Log level to be used')
     choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies')
     string(name: 'STACK_VERSION', defaultValue: '7.12-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
-    string(name: 'HELM_CHART_VERSION', defaultValue: '7.10.0', description: 'SemVer version of Helm chart to be used.')
-    string(name: 'HELM_VERSION', defaultValue: '3.4.1', description: 'SemVer version of Helm to be used.')
-    string(name: 'HELM_KIND_VERSION', defaultValue: '0.8.1', description: 'SemVer version of Kind to be used.')
+    string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.2', description: 'SemVer version of Helm chart to be used.')
+    string(name: 'HELM_VERSION', defaultValue: '3.5.2', description: 'SemVer version of Helm to be used.')
+    string(name: 'HELM_KIND_VERSION', defaultValue: '0.10.0', description: 'SemVer version of Kind to be used.')
     string(name: 'HELM_KUBERNETES_VERSION', defaultValue: '1.18.2', description: 'SemVer version of Kubernetes to be used.')
     string(name: 'GITHUB_CHECK_NAME', defaultValue: '', description: 'Name of the GitHub check to be updated. Only if this build is triggered from another parent stream.')
     string(name: 'GITHUB_CHECK_REPO', defaultValue: '', description: 'Name of the GitHub repo to be updated. Only if this build is triggered from another parent stream.')

diff --git a/.ci/scripts/install-helm-test-dependencies.sh b/.ci/scripts/install-helm-test-dependencies.sh
@@ -17,9 +17,9 @@ set -euxo pipefail
 MSG="parameter missing."
 HOME=${HOME:?$MSG}
 
-HELM_VERSION="${HELM_VERSION:-"3.4.1"}"
+HELM_VERSION="${HELM_VERSION:-"3.5.2"}"
 HELM_TAR_GZ_FILE="helm-v${HELM_VERSION}-linux-amd64.tar.gz"
-HELM_KIND_VERSION="v${HELM_KIND_VERSION:-"0.8.1"}"
+HELM_KIND_VERSION="v${HELM_KIND_VERSION:-"0.10.0"}"
 HELM_KUBERNETES_VERSION="${HELM_KUBERNETES_VERSION:-"1.18.2"}"
 
 HELM_CMD="${HOME}/bin/helm"

diff --git a/e2e/_suites/helm/README.md b/e2e/_suites/helm/README.md
@@ -33,15 +33,15 @@ This is an example of the optional configuration:
 
    ```shell
    # Depending on the versions used,
-   export HELM_VERSION="3.4.1"        # Helm version: for Helm v2.x.x we have to initialise Tiller right after the k8s cluster
-   export HELM_CHART_VERSION="7.10.0"  # version of the Elastic's Observability Helm charts
+   export HELM_VERSION="3.5.2"        # Helm version: for Helm v2.x.x we have to initialise Tiller right after the k8s cluster
+   export HELM_CHART_VERSION="7.11.2"  # version of the Elastic's Observability Helm charts
    export HELM_KUBERNETES_VERSION="1.18.2" # version of the cluster to be passed to kind
    ```
 
 3. Install dependencies.
 
-   - Install Helm 3.4.1
-   - Install Kind 0.8.1
+   - Install Helm 3.5.2
+   - Install Kind 0.10.0
    - Install Go: `https://golang.org/doc/install` _(The CI uses [GVM](https://github.com/andrewkroh/gvm))_
    - Install godog (from project's root directory): `make -C e2e install-godog`
 

diff --git a/e2e/_suites/helm/helm_charts_test.go b/e2e/_suites/helm/helm_charts_test.go
@@ -46,7 +46,7 @@ var kubectl k8s.Kubectl
 var helmVersion = "3.x"
 
 // helmChartVersion represents the default version used for the Elastic Helm charts
-var helmChartVersion = "7.10.0"
+var helmChartVersion = "7.11.2"
 
 // kubernetesVersion represents the default version used for Kubernetes
 var kubernetesVersion = "1.18.2"
@@ -362,7 +362,7 @@ func (ts *HelmChartTestSuite) getResourceName(resource string) string {
 	} else if resource == k8s.ResourceTypes.ClusterRoleBinding {
 		return strings.ToLower(ts.Name + "-" + ts.Name + "-cluster-role-binding")
 	} else if resource == k8s.ResourceTypes.ConfigMap {
-		if ts.Name == "metricbeat" {
+		if ts.Name == "filebeat" || ts.Name == "metricbeat" {
 			return strings.ToLower(ts.Name + "-" + ts.Name + "-daemonset-config")
 		}
 		return strings.ToLower(ts.Name + "-" + ts.Name + "-config")