From f381f49e1b8323c3f3d6e89dfb3f8628c05dbd98 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Fri, 15 Jan 2021 11:06:27 +0100 Subject: [PATCH] [meta] small fixes for 7.11 branch This commit update version to 7.11 in some place which were not catch in github.com/elastic/helm-charts/pull/1016. --- apm-server/README.md | 2 +- helpers/upgrade.sh | 2 +- kibana/examples/upgrade/Makefile | 3 +-- kibana/examples/upgrade/test/goss.yaml | 2 +- metricbeat/examples/upgrade/test/goss-metrics.yaml | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apm-server/README.md b/apm-server/README.md index ca46eb515..5649657ec 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -154,7 +154,7 @@ about our development and testing process. [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md [affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity [annotations]: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ -[apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.10/running-on-docker.html +[apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.11/running-on-docker.html [apm server oss docker image]: https://www.docker.elastic.co/r/apm/apm-server-oss [default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.11/elasticsearch/README.md#default [environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config diff --git a/helpers/upgrade.sh b/helpers/upgrade.sh index 269b64d8a..313e38ca5 100755 --- a/helpers/upgrade.sh +++ b/helpers/upgrade.sh @@ -25,7 +25,7 @@ usage() { --from Version to use for first install (ie: 7.7.0) --to - Version of the Docker images to use for upgrade (ie: 7.10.0) + Version of the Docker images to use for upgrade (ie: 7.11.0) EOF exit 1 } diff --git a/kibana/examples/upgrade/Makefile b/kibana/examples/upgrade/Makefile index 988c56c00..b01368a95 100644 --- a/kibana/examples/upgrade/Makefile +++ b/kibana/examples/upgrade/Makefile @@ -5,10 +5,9 @@ include ../../../helpers/examples.mk CHART := kibana RELEASE := helm-kibana-upgrade FROM := 7.4.0 # versions before 7.4.O aren't compatible with Kubernetes >= 1.16.0 -TO := 7.10.0 # required to use with Elasticsearch 7.10.0 install: - ../../../helpers/upgrade.sh --chart $(CHART) --release $(RELEASE) --from $(FROM) --to $(TO) + ../../../helpers/upgrade.sh --chart $(CHART) --release $(RELEASE) --from $(FROM) kubectl rollout status deployment $(RELEASE)-kibana test: install goss diff --git a/kibana/examples/upgrade/test/goss.yaml b/kibana/examples/upgrade/test/goss.yaml index 5b3a1b28a..d123e9f51 100644 --- a/kibana/examples/upgrade/test/goss.yaml +++ b/kibana/examples/upgrade/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"7.10.0"' + - '"number":"7.11.0"' http://localhost:5601/app/kibana: status: 200 diff --git a/metricbeat/examples/upgrade/test/goss-metrics.yaml b/metricbeat/examples/upgrade/test/goss-metrics.yaml index ed1d30db3..108d9d8e3 100644 --- a/metricbeat/examples/upgrade/test/goss-metrics.yaml +++ b/metricbeat/examples/upgrade/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - "metricbeat-7.10.0" + - "metricbeat-7.11.0" ? "http://upgrade-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat" : status: 200 timeout: 2000 body: - - "metricbeat-7.10.0" + - "metricbeat-7.11.0" file: /usr/share/metricbeat/metricbeat.yml: