Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[meta] small fixes for 7.11 branch #1022

Merged
merged 1 commit into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apm-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helpers/upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ usage() {
--from <version>
Version to use for first install (ie: 7.7.0)
--to <docker-image-version>
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
}
Expand Down
3 changes: 1 addition & 2 deletions kibana/examples/upgrade/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kibana/examples/upgrade/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/examples/upgrade/test/goss-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down