From fee1889c7f4e82a8a4f608389839c75d9b374708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Wed, 10 Mar 2021 17:33:14 +0100 Subject: [PATCH 1/5] chore: bump helm charts version --- .ci/Jenkinsfile | 2 +- e2e/_suites/helm/README.md | 2 +- e2e/_suites/helm/helm_charts_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index b695748f84..cf47223782 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -47,7 +47,7 @@ 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: '8.0.0-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_CHART_VERSION', defaultValue: '7.11.1', 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_KUBERNETES_VERSION', defaultValue: '1.18.2', description: 'SemVer version of Kubernetes to be used.') diff --git a/e2e/_suites/helm/README.md b/e2e/_suites/helm/README.md index 23e6d84a97..47f3bad0af 100644 --- a/e2e/_suites/helm/README.md +++ b/e2e/_suites/helm/README.md @@ -34,7 +34,7 @@ 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_CHART_VERSION="7.11.1" # version of the Elastic's Observability Helm charts export HELM_KUBERNETES_VERSION="1.18.2" # version of the cluster to be passed to kind ``` diff --git a/e2e/_suites/helm/helm_charts_test.go b/e2e/_suites/helm/helm_charts_test.go index 83628c2038..796821b307 100644 --- 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.1" // kubernetesVersion represents the default version used for Kubernetes var kubernetesVersion = "1.18.2" From ae1a6475078d12bf3ec8c2bb47884bda24a6c156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Wed, 10 Mar 2021 17:34:09 +0100 Subject: [PATCH 2/5] chore: bump helm version --- .ci/Jenkinsfile | 2 +- .ci/scripts/install-helm-test-dependencies.sh | 2 +- e2e/_suites/helm/README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index cf47223782..66f01c239f 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies') string(name: 'STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.1', 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_VERSION', defaultValue: '3.5.2', 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_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.') diff --git a/.ci/scripts/install-helm-test-dependencies.sh b/.ci/scripts/install-helm-test-dependencies.sh index ae616bb6d7..85a302a81e 100755 --- a/.ci/scripts/install-helm-test-dependencies.sh +++ b/.ci/scripts/install-helm-test-dependencies.sh @@ -17,7 +17,7 @@ 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_KUBERNETES_VERSION="${HELM_KUBERNETES_VERSION:-"1.18.2"}" diff --git a/e2e/_suites/helm/README.md b/e2e/_suites/helm/README.md index 47f3bad0af..a761e7f0f2 100644 --- a/e2e/_suites/helm/README.md +++ b/e2e/_suites/helm/README.md @@ -33,14 +33,14 @@ 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_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.1" # 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 Helm 3.5.2 - Install Kind 0.8.1 - 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` From 6426f754ba90d56857ee44a28d0a57e51a5860de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Wed, 10 Mar 2021 17:36:22 +0100 Subject: [PATCH 3/5] chore: bump kind version --- .ci/Jenkinsfile | 2 +- .ci/scripts/install-helm-test-dependencies.sh | 2 +- e2e/_suites/helm/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 66f01c239f..efa9e156c1 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -49,7 +49,7 @@ pipeline { string(name: 'STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.1', 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.8.1', description: 'SemVer version of Kind 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 index 85a302a81e..8037fc3453 100755 --- a/.ci/scripts/install-helm-test-dependencies.sh +++ b/.ci/scripts/install-helm-test-dependencies.sh @@ -19,7 +19,7 @@ HOME=${HOME:?$MSG} 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 index a761e7f0f2..5ca9b71562 100644 --- a/e2e/_suites/helm/README.md +++ b/e2e/_suites/helm/README.md @@ -41,7 +41,7 @@ This is an example of the optional configuration: 3. Install dependencies. - Install Helm 3.5.2 - - Install Kind 0.8.1 + - 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` From d443ebd0adc4a7a7427d5ed84020e512ebf7b46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 11 Mar 2021 17:38:16 +0100 Subject: [PATCH 4/5] fix: support filebeat deployment https://github.com/elastic/helm-charts/pull/964 introduced the feature of deploying a Kubernetes deployment instead of a Daemonset using Filebeat, using a values.yaml syntax equivalent to Metricbeat --- e2e/_suites/helm/helm_charts_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/_suites/helm/helm_charts_test.go b/e2e/_suites/helm/helm_charts_test.go index 796821b307..5edcb5b89a 100644 --- a/e2e/_suites/helm/helm_charts_test.go +++ b/e2e/_suites/helm/helm_charts_test.go @@ -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") From 138cf06dc7617e64ab4856012b681294b51ad702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Mon, 15 Mar 2021 12:14:11 +0100 Subject: [PATCH 5/5] chore: update version to 7.11.2 --- .ci/Jenkinsfile | 2 +- e2e/_suites/helm/README.md | 2 +- e2e/_suites/helm/helm_charts_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index efa9e156c1..2e8cfbab74 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -47,7 +47,7 @@ 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: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') - string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.1', description: 'SemVer version of Helm chart 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.') diff --git a/e2e/_suites/helm/README.md b/e2e/_suites/helm/README.md index 5ca9b71562..bb7484904d 100644 --- a/e2e/_suites/helm/README.md +++ b/e2e/_suites/helm/README.md @@ -34,7 +34,7 @@ This is an example of the optional configuration: ```shell # Depending on the versions used, 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.1" # version of the Elastic's Observability Helm charts + 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 ``` diff --git a/e2e/_suites/helm/helm_charts_test.go b/e2e/_suites/helm/helm_charts_test.go index 5edcb5b89a..a6c6ab7114 100644 --- 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.11.1" +var helmChartVersion = "7.11.2" // kubernetesVersion represents the default version used for Kubernetes var kubernetesVersion = "1.18.2"